From 1b8c4ff7798273cc0f2cc79465773f271e66f3d2 Mon Sep 17 00:00:00 2001 From: caoyuan Date: Thu, 15 Sep 2016 08:27:10 +0800 Subject: [PATCH] Update "which" command to "type" Validate a program exist,we should avoid "which" Refer to http://stackoverflow.com/questions/592620/check-if-a-program-exists-from-a-bash-script/677212#677212 TrivialFix Change-Id: I3d614aef2ac6598a51d830b02795ef186d4fc531 --- dev/vagrant/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/vagrant/bootstrap.sh b/dev/vagrant/bootstrap.sh index 6ae1727acd..ec89440b89 100644 --- a/dev/vagrant/bootstrap.sh +++ b/dev/vagrant/bootstrap.sh @@ -24,13 +24,13 @@ REGISTRY=${REGISTRY_URL}:${REGISTRY_PORT} ADMIN_PROTOCOL="http" function _ensure_lsb_release { - if [[ -x $(which lsb_release 2>/dev/null) ]]; then + if [[ -x $(type lsb_release 2>/dev/null) ]]; then return fi - if [[ -x $(which apt-get 2>/dev/null) ]]; then + if [[ -x $(type apt-get 2>/dev/null) ]]; then apt-get -y install lsb-release - elif [[ -x $(which yum 2>/dev/null) ]]; then + elif [[ -x $(type yum 2>/dev/null) ]]; then yum -y install redhat-lsb-core fi }