From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Wed, 12 Mar 2014 17:09:59 +0000 (+0100)
Subject: build-doc: fix checks for required commands for non-debian
X-Git-Tag: v0.78~35^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1434%2Fhead;p=ceph.git

build-doc: fix checks for required commands for non-debian

Fixes: 7695

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/admin/build-doc b/admin/build-doc
index 634d5808b43b..df77a35d2872 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