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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5233E1382C5 for ; Thu, 29 Apr 2021 09:31:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 77E31E0207; Thu, 29 Apr 2021 09:31:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5BC8DE0207 for ; Thu, 29 Apr 2021 09:31:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 074D03410C1 for ; Thu, 29 Apr 2021 09:31:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5B7C0CC for ; Thu, 29 Apr 2021 09:31:15 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1619688644.03882029a2dcbe2aa9df402b36788db33ac94b9d.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.4/scripts/, 2.4/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.4/init/apache2.initd 2.4/scripts/apache2ctl X-VCS-Directories: 2.4/scripts/ 2.4/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 03882029a2dcbe2aa9df402b36788db33ac94b9d X-VCS-Branch: master Date: Thu, 29 Apr 2021 09:31:15 +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: c8f16155-a31d-4602-bc91-bed91dcd0743 X-Archives-Hash: 4bb2562e686f8e948f002223816b48c7 commit: 03882029a2dcbe2aa9df402b36788db33ac94b9d Author: Lars Wendler gentoo org> AuthorDate: Thu Apr 29 09:30:44 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Apr 29 09:30:44 2021 +0000 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=03882029 Minor shell style fixes Signed-off-by: Lars Wendler gentoo.org> 2.4/init/apache2.initd | 12 ++++++------ 2.4/scripts/apache2ctl | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd index fc09ddd..0058e20 100755 --- a/2.4/init/apache2.initd +++ b/2.4/init/apache2.initd @@ -72,12 +72,12 @@ checkconfig() { OUTPUT=$( ${APACHE2} ${APACHE2_OPTS} -t 2>&1 ) ret=$? - if [ $ret -ne 0 ]; then + if [ ${ret} -ne 0 ]; then eerror "${SVCNAME} has detected an error in your setup:" printf "%s\n" "${OUTPUT}" fi - return $ret + return ${ret} } start() { @@ -96,12 +96,12 @@ start() { ${APACHE2} ${APACHE2_OPTS} -k start local i=0 retval=1 - while [ $i -lt ${TIMEOUT} ] ; do + while [ ${i} -lt ${TIMEOUT} ] ; do if [ -e "${PIDFILE}" ] ; then retval=0 break fi - sleep 1 && i=$(expr $i + 1) + sleep 1 && i=$(expr ${i} + 1) done eend ${retval} @@ -123,8 +123,8 @@ stop() { local i=0 retval=0 while ( test -f "${PIDFILE}" || pgrep -P ${PID} apache2 >/dev/null ) \ - && [ $i -lt ${TIMEOUT} ]; do - sleep 1 && i=$(expr $i + 1) + && [ ${i} -lt ${TIMEOUT} ]; do + sleep 1 && i=$(expr ${i} + 1) done [ -e "${PIDFILE}" ] && retval=1 diff --git a/2.4/scripts/apache2ctl b/2.4/scripts/apache2ctl index 872044b..890ded5 100644 --- a/2.4/scripts/apache2ctl +++ b/2.4/scripts/apache2ctl @@ -89,7 +89,7 @@ configdump() { } -if ! is_systemd; then +if ! is_systemd ; then # If systemd IS NOT detected, run the legacy apache2ctl code # If first parameter is a verb defined in $RC_VERBS, pass the command to init script.