]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
build/ops: unify command substitution in install-deps.sh
authorNathan Cutler <ncutler@suse.com>
Wed, 1 Aug 2018 10:33:58 +0000 (12:33 +0200)
committerNathan Cutler <ncutler@suse.com>
Fri, 4 Oct 2019 15:30:24 +0000 (17:30 +0200)
The $() form is preferable to `` because folks (like me) might be using
` as a keyboard shortcut to GNU Screen, causing havoc to ensue whenever
copy-pasting the ` character.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit e0042dd617269934bf51efee5bab7e4485875576)

Conflicts:
install-deps.sh
- include a part of b6d9464806b74c9f40e03258a004921f472d122e

install-deps.sh

index 798f77fd93619106cf5caeb8bd8a42d4bdc04b7c..1c661d2313e7aed2be9926e88b8f07e01a6a6677 100755 (executable)
@@ -19,6 +19,8 @@ if test $(id -u) != 0 ; then
 fi
 export LC_ALL=C # the following is vulnerable to i18n
 
+ARCH=$(uname -m)
+
 function munge_ceph_spec_in {
     local OUTFILE=$1
     sed -e 's/@//g' -e 's/%bcond_with make_check/%bcond_without make_check/g' < ceph.spec.in > $OUTFILE
@@ -93,7 +95,7 @@ EOF
     fi
 }
 
-if [ x`uname`x = xFreeBSDx ]; then
+if [ x$(uname)x = xFreeBSDx ]; then
     $SUDO pkg install -yq \
         devel/babeltrace \
         devel/git \