commit: 65a60b84f492efeb391e853724c12c0b78b2aa25 Author: Tomáš Mózes <hydrapolic <AT> gmail <DOT> com> AuthorDate: Thu Apr 19 20:49:27 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Thu Apr 19 20:49:27 2018 +0000 URL: https://gitweb.gentoo.org/proj/apache.git/commit/?id=65a60b84
init scripts: Replaced non-POSIX compliant "type -p" calls. Closes: https://bugs.gentoo.org/635400 2.2/init/apache2.initd | 4 ++-- 2.4/init/apache2.initd | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index 46f0dbb..b66826b 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -156,7 +156,7 @@ fullstatus() { LYNX="${LYNX:-lynx -dump}" STATUSURL="${STATUSURL:-http://localhost/server-status}"; - if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then eerror "lynx not found! you need to emerge www-client/lynx" else ${LYNX} ${STATUSURL} @@ -174,7 +174,7 @@ configdump() { checkconfd || return 1 - if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then eerror "lynx not found! you need to emerge www-client/lynx" else echo "${APACHE2} started with '${APACHE2_OPTS}'" diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd index 2e3bd7a..b0be24a 100755 --- a/2.4/init/apache2.initd +++ b/2.4/init/apache2.initd @@ -151,7 +151,7 @@ modules() { } fullstatus() { - if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then eerror "lynx not found! you need to emerge www-client/lynx" else ${LYNX} ${STATUSURL} @@ -168,7 +168,7 @@ configdump() { checkconfd || return 1 - if ! type -p $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then + if ! command -v $(set -- ${LYNX}; echo $1) 2>&1 >/dev/null; then eerror "lynx not found! you need to emerge www-client/lynx" else echo "${APACHE2} started with '${APACHE2_OPTS}'"
