summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorDanny Al-Gaaf <danny.al-gaaf@bisect.de>2014-03-12 18:09:59 +0100
committerDanny Al-Gaaf <danny.al-gaaf@bisect.de>2014-03-12 18:09:59 +0100
commit8e76e4e4faaca7296d777d529e1c99570791f75d (patch)
treeaa5c28676d865201a8f1ed5f282f3bdb7388d843 /admin
parentc55da14a3d057c36a730383c3a53d8ca14e30d16 (diff)
downloadceph-8e76e4e4faaca7296d777d529e1c99570791f75d.tar.gz
build-doc: fix checks for required commands for non-debian
Fixes: 7695 Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Diffstat (limited to 'admin')
-rwxr-xr-xadmin/build-doc9
1 files changed, 5 insertions, 4 deletions
diff --git a/admin/build-doc b/admin/build-doc
index 634d5808b43..df77a35d287 100755
--- a/admin/build-doc
+++ b/admin/build-doc
@@ -1,5 +1,4 @@
#!/bin/sh
-set -e
cd "$(dirname "$0")"
cd ..
TOPDIR=`pwd`
@@ -19,10 +18,12 @@ if command -v dpkg >/dev/null; then
exit 1
fi
else
- for command in virtualenv doxygen ditaa ant; do
- if ! command -v "$command" >/dev/null; then
+ for command in virtualenv doxygen ant ditaa; do
+ command -v "$command" > /dev/null;
+ ret_code=$?
+ if [ $ret_code -ne 0 ]; then
# add a space after old values
- missing="${missing:+$missing }$package"
+ missing="${missing:+$missing }$command"
fi
done
if [ -n "$missing" ]; then