aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtools/init-runonce12
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/init-runonce b/tools/init-runonce
index 7946699f4..7fb50f738 100755
--- a/tools/init-runonce
+++ b/tools/init-runonce
@@ -12,10 +12,14 @@ unset LANGUAGE
LC_ALL=C
export LC_ALL
for i in curl nova neutron openstack; do
- if [[ ! $(which $i) ]]; then
- echo "$i not installed. Please install $i before proceeding"
- exit 1
- fi
+ if [[ ! $(type $i 2>/dev/null) ]]; then
+ if [ "$i" == 'curl' ]; then
+ echo "$i not installed. Please install $i before proceeding"
+ else
+ echo "python-${i}client not installed. Please install python-${i}client before proceeding"
+ fi
+ exit
+ fi
done
# Move to top level directory
REAL_PATH=$(python -c "import os,sys;print os.path.realpath('$0')")