| 1 |
commit: 03882029a2dcbe2aa9df402b36788db33ac94b9d |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 29 09:30:44 2021 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 29 09:30:44 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=03882029 |
| 7 |
|
| 8 |
Minor shell style fixes |
| 9 |
|
| 10 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
| 11 |
|
| 12 |
2.4/init/apache2.initd | 12 ++++++------ |
| 13 |
2.4/scripts/apache2ctl | 2 +- |
| 14 |
2 files changed, 7 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd |
| 17 |
index fc09ddd..0058e20 100755 |
| 18 |
--- a/2.4/init/apache2.initd |
| 19 |
+++ b/2.4/init/apache2.initd |
| 20 |
@@ -72,12 +72,12 @@ checkconfig() { |
| 21 |
|
| 22 |
OUTPUT=$( ${APACHE2} ${APACHE2_OPTS} -t 2>&1 ) |
| 23 |
ret=$? |
| 24 |
- if [ $ret -ne 0 ]; then |
| 25 |
+ if [ ${ret} -ne 0 ]; then |
| 26 |
eerror "${SVCNAME} has detected an error in your setup:" |
| 27 |
printf "%s\n" "${OUTPUT}" |
| 28 |
fi |
| 29 |
|
| 30 |
- return $ret |
| 31 |
+ return ${ret} |
| 32 |
} |
| 33 |
|
| 34 |
start() { |
| 35 |
@@ -96,12 +96,12 @@ start() { |
| 36 |
${APACHE2} ${APACHE2_OPTS} -k start |
| 37 |
|
| 38 |
local i=0 retval=1 |
| 39 |
- while [ $i -lt ${TIMEOUT} ] ; do |
| 40 |
+ while [ ${i} -lt ${TIMEOUT} ] ; do |
| 41 |
if [ -e "${PIDFILE}" ] ; then |
| 42 |
retval=0 |
| 43 |
break |
| 44 |
fi |
| 45 |
- sleep 1 && i=$(expr $i + 1) |
| 46 |
+ sleep 1 && i=$(expr ${i} + 1) |
| 47 |
done |
| 48 |
|
| 49 |
eend ${retval} |
| 50 |
@@ -123,8 +123,8 @@ stop() { |
| 51 |
|
| 52 |
local i=0 retval=0 |
| 53 |
while ( test -f "${PIDFILE}" || pgrep -P ${PID} apache2 >/dev/null ) \ |
| 54 |
- && [ $i -lt ${TIMEOUT} ]; do |
| 55 |
- sleep 1 && i=$(expr $i + 1) |
| 56 |
+ && [ ${i} -lt ${TIMEOUT} ]; do |
| 57 |
+ sleep 1 && i=$(expr ${i} + 1) |
| 58 |
done |
| 59 |
[ -e "${PIDFILE}" ] && retval=1 |
| 60 |
|
| 61 |
|
| 62 |
diff --git a/2.4/scripts/apache2ctl b/2.4/scripts/apache2ctl |
| 63 |
index 872044b..890ded5 100644 |
| 64 |
--- a/2.4/scripts/apache2ctl |
| 65 |
+++ b/2.4/scripts/apache2ctl |
| 66 |
@@ -89,7 +89,7 @@ configdump() { |
| 67 |
} |
| 68 |
|
| 69 |
|
| 70 |
-if ! is_systemd; then |
| 71 |
+if ! is_systemd ; then |
| 72 |
# If systemd IS NOT detected, run the legacy apache2ctl code |
| 73 |
|
| 74 |
# If first parameter is a verb defined in $RC_VERBS, pass the command to init script. |
Archives