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 AB3011382C5 for ; Thu, 19 Apr 2018 20:51:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E5F7DE0A7C; Thu, 19 Apr 2018 20:51:00 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 BD880E0A7C for ; Thu, 19 Apr 2018 20:51:00 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 333F9335C09 for ; Thu, 19 Apr 2018 20:50:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 99C20243 for ; Thu, 19 Apr 2018 20:50:57 +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: <1524170967.65a60b84f492efeb391e853724c12c0b78b2aa25.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.4/init/, 2.2/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.2/init/apache2.initd 2.4/init/apache2.initd X-VCS-Directories: 2.4/init/ 2.2/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 65a60b84f492efeb391e853724c12c0b78b2aa25 X-VCS-Branch: master Date: Thu, 19 Apr 2018 20:50:57 +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-Archives-Salt: f50b79c4-ff3a-4656-8532-78d192c8aef8 X-Archives-Hash: 86372cd310eca01836dc581cde95eea5 commit: 65a60b84f492efeb391e853724c12c0b78b2aa25 Author: Tomáš Mózes gmail com> AuthorDate: Thu Apr 19 20:49:27 2018 +0000 Commit: Lars Wendler gentoo 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}'"