diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-07-09 15:43:36 +0100 |
commit | 2719f73b6813d11d13a9650cdd2ab8ec6e69385d (patch) | |
tree | 8c816148bcbd22757d892089c989ae614eae4f5a /media-video/mjpg-streamer | |
parent | 0f558761aa2dee1017b4751e4017205e015a9560 (diff) |
gentoo resync : 09.07.2022
Diffstat (limited to 'media-video/mjpg-streamer')
-rw-r--r-- | media-video/mjpg-streamer/Manifest | 2 | ||||
-rw-r--r-- | media-video/mjpg-streamer/files/mjpg-streamer.initd | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/media-video/mjpg-streamer/Manifest b/media-video/mjpg-streamer/Manifest index f36b567df5fe..388c1cfe3df1 100644 --- a/media-video/mjpg-streamer/Manifest +++ b/media-video/mjpg-streamer/Manifest @@ -1,6 +1,6 @@ AUX make-var-instead-of-cmd.patch 3716 BLAKE2B 322c6ada49e976840e949ca781eca29e1008c781c6aa578586bb7ef522b6fe2227a9c6b6f60ac7d4d1c982ddf926e522798aa7ebde74d2a272e57b4d8c2c1cef SHA512 e585b6f2988020087ffd2dd33878e6392baeb94f6020471ade157d1f27df073f363f5fc05107ef1b21fad69aaacf0a53096e48ce5c8eeaf77a6a328780d64e9d AUX mjpg-streamer.confd 347 BLAKE2B f544307fca9e420d5a8edd3b8ea1834dc5d9125d2aba627361ef381329036831ee2d19925dff5f5cc7fb5b1d6623dcb33e74c68966d88749cd9b84325aa78f5c SHA512 15841b10f0caa136b58372e180bfc3a0198d323ef2df22ddd2b334c09d0d376cac78d799c327306105bc97648ee40a3d0c78ef013a421f9468be7f89278baa33 -AUX mjpg-streamer.initd 1265 BLAKE2B e42564a98636a1a5dc059bd418e281ab6da494f88cb64cd56c58401d55c4e02208c5f45289d0ee04ce16fe4118a7cbcd2f5f2d4a289f171be790bbb5e8d81a3e SHA512 4cc90922e9fbd966f9a41719e18672e46a94a7206f18e12e8ac19bd40de3944597f0323c42862731079201367381af9de8cfd4ee8d89f7fc3173640fda9ef5d9 +AUX mjpg-streamer.initd 1291 BLAKE2B a3baa4d0f67a89eee8beff48cbc9c13ba3c9bde7f973668e92ad4901db5b2054b66fd9bf19f7bbfbe291395ad6098032fb8a25a53950c4cdc8823dc93fa1ef43 SHA512 3fbdd4e8d17d5f4e49c3a2620550fddca3733593e6e84ea5907362762e420c68301ecccbcac1e8e64a3ec05d47a43276ba4ca21717425a38bb04d068d46c9cfa AUX to-work-with-kernel-3.18.patch 2832 BLAKE2B 157c3c5c30973cdc64d9bd0a5cadba238dd6e33d72b96b0776065f57bb34e14f47336e509e8dbf1fe6fbb8f715fd99837b42e9ecec6fcc4c5da1101300c1e900 SHA512 c619c788fd09118f309b081eabb7f80835690923e098368f16f26a7b4e6b63e494dd5f91a9fe73d83b3151b77dd6393263ab3756f7d8b3a6286ac3d52f1e89c8 DIST mjpg-streamer-0_pre20120621.tar.bz2 471546 BLAKE2B 3ede2a60062bba7c91ddfa0d7151e32cd8dac11a083cc6a88dc350a523174685b2ff066fa99db13b82a6a4960d370b97b27aa3663ac323fa54908bb0108857d0 SHA512 dfc6077ec03fe4f239d8e25b65b7808bd489a954d8cf3aeed444e68fd9536720c2c888a5fa9f4b8d0152dab5ca0bd166a46f2cb22a357ba816eb5bc79ff11332 DIST mjpg-streamer-0_pre20200524.tar.gz 711183 BLAKE2B 3a40f20f518a53c0c6046cf37728c46c2a843a1dd0ef0086c77940b5133f1337445b1edb2c21edc1bbacc588f7c7b45b1530871c944695c2ae02cf327fde6847 SHA512 d6e910f6693b27c16c33749458affcb4d9336bd15c642156c452fcbc4a8c2ba9f4a6102e6b94f698fc6fb48da9564a09cb0f804a5ac52201e566adf798a70ba2 diff --git a/media-video/mjpg-streamer/files/mjpg-streamer.initd b/media-video/mjpg-streamer/files/mjpg-streamer.initd index e7116dba01d2..3b307e777c94 100644 --- a/media-video/mjpg-streamer/files/mjpg-streamer.initd +++ b/media-video/mjpg-streamer/files/mjpg-streamer.initd @@ -3,7 +3,7 @@ # 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=$(printf %s "${SVCNAME}" | tr - _) depend() { use logger @@ -11,17 +11,16 @@ depend() { } checkconfig() { - local vars + set -- - [[ ${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# }" + [ "${INPUT_PLUGIN}" ] || set -- "$@" INPUT_PLUGIN + [ "${OUTPUT_PLUGIN}" ] || set -- "$@" OUTPUT_PLUGIN + [ "${MJPG_STREAMER_USER}" ] || set -- "$@" MJPG_STREAMER_USER + [ "${MJPG_STREAMER_GROUP}" ] || set -- "$@" MJPG_STREAMER_GROUP - if [[ ${vars} ]]; then + if [ $# -gt 0 ]; then eerror "Required variables in /etc/conf.d/${SVCNAME} are not set:" - eerror " ${vars// /, }" + eerror " $(IFS=,; printf %s "$*")" return 1 fi @@ -31,7 +30,7 @@ checkconfig() { start() { checkconfig || return $? ebegin "Starting ${SVCNAME}" - start-stop-daemon --start --exec /usr/bin/${MY_NAME} \ + start-stop-daemon --start --exec "/usr/bin/${MY_NAME}" \ --user "${MJPG_STREAMER_USER}" \ --group "${MJPG_STREAMER_GROUP}" -w 100 -b -m \ --pidfile "${MJPG_STREAMER_PIDFILE}" \ @@ -42,7 +41,7 @@ start() { stop() { ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop --exec /usr/bin/${MY_NAME} \ + start-stop-daemon --stop --exec "/usr/bin/${MY_NAME}" \ --pidfile "${MJPG_STREAMER_PIDFILE}" eend $? } |