RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-04-18 05:15:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

build/ops: fix /etc/os-release parsing in install-deps.sh

Browse Source 
85a370e35f 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 <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2016-09-05 15:40:33 +02:00
parent 187e4fcb1e
commit fd37e87f6d
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install-deps.sh
View File

@ -55,8 +55,8 @@ if [ x`uname`x = xFreeBSDx ]; then
exit exit
else else
DISTRO=$(grep "^ID=" /etc/os-release | sed "s/ID=//") source /etc/os-release
case $DISTRO in case $ID in
debian|ubuntu|devuan) debian|ubuntu|devuan)
echo "Using apt-get to install dependencies" echo "Using apt-get to install dependencies"
$SUDO apt-get install -y lsb-release devscripts equivs $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 $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 esac
fi fi