Merge pull request #4890 from dokku/drop-which
Drop which in favor of command -v
This commit is contained in:
@@ -7,7 +7,7 @@ nginx_needs_upgrade() {
|
||||
local MAJOR_VERSION MINOR_VERSION
|
||||
local NEEDS_UPGRADE=true
|
||||
|
||||
if ! which nginx >/dev/null 2>&1; then
|
||||
if ! command -v nginx &>/dev/null; then
|
||||
echo $NEEDS_UPGRADE
|
||||
return
|
||||
fi
|
||||
@@ -45,7 +45,7 @@ trigger-nginx-vhosts-dependencies() {
|
||||
return
|
||||
fi
|
||||
|
||||
if ! which nginx >/dev/null 2>&1; then
|
||||
if ! command -v nginx &>/dev/null; then
|
||||
nginx_install
|
||||
return
|
||||
fi
|
||||
|
||||
@@ -75,7 +75,7 @@ fn-nginx-vhosts-nginx-location() {
|
||||
declare desc="check that nginx is at the expected location and return it"
|
||||
local NGINX_LOCATION
|
||||
|
||||
NGINX_LOCATION=$(which nginx 2>/dev/null)
|
||||
NGINX_LOCATION=$(command -v nginx 2>/dev/null)
|
||||
if [[ -z "$NGINX_LOCATION" ]]; then
|
||||
NGINX_LOCATION="/usr/sbin/nginx"
|
||||
fi
|
||||
|
||||
Reference in New Issue
Block a user