From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B572158093 for ; Sun, 3 Jul 2022 06:06:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25D9AE08C4; Sun, 3 Jul 2022 06:06:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F0159E08C4 for ; Sun, 3 Jul 2022 06:06:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD2E6341D2C for ; Sun, 3 Jul 2022 06:06:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15E0550C for ; Sun, 3 Jul 2022 06:06:47 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1656828403.79e5420c22ca6dbb708ef68058c1fff8a8b941f6.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mjpg-streamer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mjpg-streamer/files/mjpg-streamer.initd X-VCS-Directories: media-video/mjpg-streamer/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 79e5420c22ca6dbb708ef68058c1fff8a8b941f6 X-VCS-Branch: master Date: Sun, 3 Jul 2022 06:06:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d834c4a0-52d8-4f84-b3db-94fa6a501c18 X-Archives-Hash: b294b49d7c4fe1a4ef14f16f9939e519 commit: 79e5420c22ca6dbb708ef68058c1fff8a8b941f6 Author: Joonas Niilola gentoo org> AuthorDate: Sun Jul 3 06:03:59 2022 +0000 Commit: Joonas Niilola gentoo 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 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