Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/apache:master commit in: 2.4/scripts/
Date: Fri, 23 Mar 2018 16:22:12
Message-Id: 1521822010.04a0e8d110f76f7e432e32ecf87a81be83e5cf9b.polynomial-c@gentoo
1 commit: 04a0e8d110f76f7e432e32ecf87a81be83e5cf9b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 23 16:16:16 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 23 16:20:10 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=04a0e8d1
7
8 2.4/scripts/apache2ctl: POSIX shells don't know =~ test operator.
9
10 Fixed by using "echo ... | grep -q ..." combination.
11
12 Gentoo-Bug: https://bugs.gentoo.org/650678
13
14 2.4/scripts/apache2ctl | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/2.4/scripts/apache2ctl b/2.4/scripts/apache2ctl
18 index 2c7c699..6f5920d 100644
19 --- a/2.4/scripts/apache2ctl
20 +++ b/2.4/scripts/apache2ctl
21 @@ -17,7 +17,7 @@ load_rc_config() {
22
23 # If first parameter is a verb defined in $RC_VERBS, pass the command to init script.
24 # In other cases, compile command line and run the command on apache binary.
25 -if [ "${RC_VERBS}" =~ "${1}" ] ; then
26 +if echo "${RC_VERBS}" | grep -q "${1}" ; then
27 exec /etc/init.d/apache2 "${@}"
28 else
29 load_rc_config || exit 1