From: Nathan Cutler <ncutler@suse.com>
Date: Wed, 1 Aug 2018 10:33:58 +0000 (+0200)
Subject: build/ops: unify command substitution in install-deps.sh
X-Git-Tag: v12.2.13~109^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6af095f3dbd78e160afd592e00c204a4b5b7c0cd;p=ceph.git

build/ops: unify command substitution in install-deps.sh

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
---

diff --git a/install-deps.sh b/install-deps.sh
index 798f77fd936..1c661d2313e 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -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 \