| 1 |
commit: 1a15764fea542d473a1abf67ccccd8fd5dee68d5 |
| 2 |
Author: ChaosEngine <andrzej.pauli <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Jun 12 15:38:23 2022 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 2 17:35:14 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a15764f |
| 7 |
|
| 8 |
media-video/mjpg-streamer: fix init script's non-POSIX features |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/848474 |
| 11 |
Signed-off-by: Andrzej Pauli ( <AT> ChaosEngine) <andrzej.pauli@×××××.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/25865 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
media-video/mjpg-streamer/files/mjpg-streamer.initd | 14 +++++++------- |
| 16 |
1 file changed, 7 insertions(+), 7 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd |
| 19 |
index e7116dba01d2..71da09faedf6 100644 |
| 20 |
--- a/media-video/mjpg-streamer/files/mjpg-streamer.initd |
| 21 |
+++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd |
| 22 |
@@ -1,9 +1,9 @@ |
| 23 |
#!/sbin/openrc-run |
| 24 |
-# Copyright 1999-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2022 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
MJPG_STREAMER_PIDFILE="${MJPG_STREAMER_PIDFILE:-/var/run/${SVCNAME}.pid}" |
| 29 |
-MY_NAME=${SVCNAME//-/_} |
| 30 |
+MY_NAME="${SVCNAME//-/_}" |
| 31 |
|
| 32 |
depend() { |
| 33 |
use logger |
| 34 |
@@ -13,13 +13,13 @@ depend() { |
| 35 |
checkconfig() { |
| 36 |
local vars |
| 37 |
|
| 38 |
- [[ ${INPUT_PLUGIN} ]] || vars+=\ INPUT_PLUGIN |
| 39 |
- [[ ${OUTPUT_PLUGIN} ]] || vars+=\ OUTPUT_PLUGIN |
| 40 |
- [[ ${MJPG_STREAMER_USER} ]] || vars+=\ MJPG_STREAMER_USER |
| 41 |
- [[ ${MJPG_STREAMER_GROUP} ]] || vars+=\ MJPG_STREAMER_GROUP |
| 42 |
+ [ "${INPUT_PLUGIN}" ] || vars+=\ INPUT_PLUGIN |
| 43 |
+ [ "${OUTPUT_PLUGIN}" ] || vars+=\ OUTPUT_PLUGIN |
| 44 |
+ [ "${MJPG_STREAMER_USER}" ] || vars+=\ MJPG_STREAMER_USER |
| 45 |
+ [ "${MJPG_STREAMER_GROUP}" ] || vars+=\ MJPG_STREAMER_GROUP |
| 46 |
vars="${vars# }" |
| 47 |
|
| 48 |
- if [[ ${vars} ]]; then |
| 49 |
+ if [ "${vars}" ]; then |
| 50 |
eerror "Required variables in /etc/conf.d/${SVCNAME} are not set:" |
| 51 |
eerror " ${vars// /, }" |
| 52 |
return 1 |
Archives