From f17077577096811718be8b8a01d17eaaf8e7341d Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 1 Aug 2018 12:28:59 +0200 Subject: [PATCH] build/ops: streamline processing of WITH_SEASTAR env var Quoting relevant portion of "man test": STRING equivalent to -n STRING Signed-off-by: Nathan Cutler --- install-deps.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 3dc3828af2a23..b6ad79a07182d 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -23,14 +23,8 @@ export LC_ALL=C # the following is vulnerable to i18n ARCH=`uname -m` -if [ -n "$WITH_SEASTAR" ]; then - with_seastar=true -else - with_seastar=false -fi - function install_seastar_deps { - if $with_seastar; then + if [ $WITH_SEASTAR ]; then $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y \ ragel libc-ares-dev libhwloc-dev libnuma-dev libpciaccess-dev \ libcrypto++-dev libgnutls28-dev libsctp-dev libprotobuf-dev \ @@ -46,7 +40,7 @@ function munge_ceph_spec_in { else sed -i -e 's/%bcond_without python2/%bcond_with python2/g' $OUTFILE fi - if $with_seastar; then + if [ $WITH_SEASTAR ]; then sed -i -e 's/%bcond_with seastar/%bcond_without seastar/g' $OUTFILE fi } -- 2.39.5