From a92355445731a416bb948f2424c70ac7cec24eb6 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Mon, 31 Oct 2022 13:52:50 -0400 Subject: [PATCH] install-deps.sh: source lib-build.sh Currently, only in_jenkins is used. More will come later. Signed-off-by: John Mulligan (cherry picked from commit 9b7db758c3f2a381e58790b60aee8908b9a6f1fa) (cherry picked from commit aee71d803a58605b4dae1abf325e3a7af86b3768) --- install-deps.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index eb773c3eb40..dc35b4b293e 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -12,6 +12,14 @@ # version 2.1 of the License, or (at your option) any later version. # set -e + +if ! [ "${_SOURCED_LIB_BUILD}" = 1 ]; then + SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" + CEPH_ROOT="${SCRIPT_DIR}" + . "${CEPH_ROOT}/src/script/lib-build.sh" || exit 2 +fi + + DIR=/tmp/install-deps.$$ trap "rm -fr $DIR" EXIT mkdir -p $DIR @@ -24,9 +32,6 @@ export LC_ALL=C.UTF-8 ARCH=$(uname -m) -function in_jenkins() { - test -n "$JENKINS_HOME" -} function munge_ceph_spec_in { local with_seastar=$1 -- 2.39.5