From fd37e87f6de0b8e272a2859ec52d6ceab277db7a Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Mon, 5 Sep 2016 15:40:33 +0200 Subject: [PATCH] build/ops: fix /etc/os-release parsing in install-deps.sh 85a370e35fc42031a7f7e24dea9e50a649c0f309 introduced the DISTRO variable whose value was obtained by parsing /etc/os-release like this: DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//") This unfortunately picks up the double-quotes, so on a CentOS system DISTRO will be equal to '"centos"'. Signed-off-by: Nathan Cutler --- install-deps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install-deps.sh b/install-deps.sh index 486d40d27c30..96bd419a8224 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -55,8 +55,8 @@ if [ x`uname`x = xFreeBSDx ]; then exit else - DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//") - case $DISTRO in + source /etc/os-release + case $ID in debian|ubuntu|devuan) echo "Using apt-get to install dependencies" $SUDO apt-get install -y lsb-release devscripts equivs @@ -118,7 +118,7 @@ else $SUDO zypper --non-interactive install $(rpmspec -q --buildrequires $DIR/ceph.spec) || exit 1 ;; *) - echo "$DISTRO is unknown, dependencies will have to be installed manually." + echo "$ID is unknown, dependencies will have to be installed manually." ;; esac fi -- 2.47.3