From: Michael Fritch Date: Thu, 5 Dec 2019 14:58:48 +0000 (-0700) Subject: ceph-daemon: remove guesswork to find script file X-Git-Tag: v15.1.0~587^2 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=995e5c3209c96806b67f5a0def329e7feefc7caf;p=ceph-ci.git ceph-daemon: remove guesswork to find script file Allow passing CEPH_DAEMON via the environment or default to using the script from the standard location. Signed-off-by: Michael Fritch --- diff --git a/qa/standalone/test_ceph_daemon.sh b/qa/standalone/test_ceph_daemon.sh index 1aa0f36a3ec..69eaf434e1b 100755 --- a/qa/standalone/test_ceph_daemon.sh +++ b/qa/standalone/test_ceph_daemon.sh @@ -22,16 +22,12 @@ OSD_LV_NAME=${SCRIPT_NAME%.*} [ -z "$SUDO" ] && SUDO=sudo if [ -z "$CEPH_DAEMON" ]; then - [ -x src/ceph-daemon/ceph-daemon ] && CEPH_DAEMON=src/ceph-daemon/ceph-daemon - [ -x ../src/ceph-daemon/ceph-daemon ] && CEPH_DAEMON=../src/ceph-daemon/ceph-daemon - [ -x ./ceph-daemon/ceph-daemon ] && CEPH_DAEMON=./ceph-daemon/ceph-daemon - [ -x ./ceph-daemon ] && CEPH_DAEMON=.ceph-daemon - which ceph-daemon && CEPH_DAEMON=$(which ceph-daemon) + CEPH_DAEMON=${SCRIPT_DIR}/../../src/ceph-daemon/ceph-daemon fi # at this point, we need $CEPH_DAEMON set -if [ -z "$CEPH_DAEMON" ]; then - echo "ceph-daemon not found.Please set \$CEPH_DAEMON" +if ! [ -x "$CEPH_DAEMON" ]; then + echo "ceph-daemon not found. Please set \$CEPH_DAEMON" exit 1 fi