commit:     79e5420c22ca6dbb708ef68058c1fff8a8b941f6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jul  3 06:03:59 2022 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 06:06:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79e5420c

Revert "media-video/mjpg-streamer: fix init script's non-POSIX features"

This reverts commit 1a15764fea542d473a1abf67ccccd8fd5dee68d5.
A better fix coming right up.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 media-video/mjpg-streamer/files/mjpg-streamer.initd | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd 
b/media-video/mjpg-streamer/files/mjpg-streamer.initd
index 71da09faedf6..e7116dba01d2 100644
--- a/media-video/mjpg-streamer/files/mjpg-streamer.initd
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd
@@ -1,9 +1,9 @@
 #!/sbin/openrc-run
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 MJPG_STREAMER_PIDFILE="${MJPG_STREAMER_PIDFILE:-/var/run/${SVCNAME}.pid}"
-MY_NAME="${SVCNAME//-/_}"
+MY_NAME=${SVCNAME//-/_}
 
 depend() {
        use logger
@@ -13,13 +13,13 @@ depend() {
 checkconfig() {
        local vars
 
-       [ "${INPUT_PLUGIN}" ] || vars+=\ INPUT_PLUGIN
-       [ "${OUTPUT_PLUGIN}" ] || vars+=\ OUTPUT_PLUGIN
-       [ "${MJPG_STREAMER_USER}" ] || vars+=\ MJPG_STREAMER_USER
-       [ "${MJPG_STREAMER_GROUP}" ] || vars+=\ MJPG_STREAMER_GROUP
+       [[ ${INPUT_PLUGIN} ]] || vars+=\ INPUT_PLUGIN
+       [[ ${OUTPUT_PLUGIN} ]] || vars+=\ OUTPUT_PLUGIN
+       [[ ${MJPG_STREAMER_USER} ]] || vars+=\ MJPG_STREAMER_USER
+       [[ ${MJPG_STREAMER_GROUP} ]] || vars+=\ MJPG_STREAMER_GROUP
        vars="${vars# }"
 
-       if [ "${vars}" ]; then
+       if [[ ${vars} ]]; then
                eerror "Required variables in /etc/conf.d/${SVCNAME} are not 
set:"
                eerror "  ${vars// /, }"
                return 1

Reply via email to