Cleanup some antipatterns

Author: blag

actions/setup_e2e_tests.sh

@@ -2,12 +2,12 @@
 set -e
 
 VERSION=$1
-BRANCH=`echo ${VERSION} | cut -d "." -f1-2`
+BRANCH=$(echo ${VERSION} | cut -d "." -f1-2)
 PIP="pip"
 
 # Install OS specific pre-reqs (Better moved to puppet at some point.)
-DEBTEST=`lsb_release -a 2> /dev/null | grep Distributor | awk '{print $3}'`
-RHTEST=`cat /etc/redhat-release 2> /dev/null | sed -e "s~\(.*\)release.*~\1~g"`
+DEBTEST=$(lsb_release -a 2> /dev/null | grep Distributor | awk '{print $3}')
+RHTEST=$(cat /etc/redhat-release 2> /dev/null | sed -e "s~\(.*\)release.*~\1~g")
 
 # Decrease interval for MongoDB TTL expire thread. By default it runs every 60 seconds which
 # means we would need to wait at least 60 seconds in our key expire end to end tests.
@@ -18,7 +18,7 @@ echo -e "\nsetParameter:\n  ttlMonitorSleepSecs: 1" | sudo tee -a /etc/mongod.co
 sudo cat /etc/mongod.conf
 
 if [[ -n "$RHTEST" ]]; then
-    RHVERSION=`cat /etc/redhat-release 2> /dev/null | sed -r 's/([^0-9]*([0-9]*)){1}.*/\2/'`
+    RHVERSION=$(cat /etc/redhat-release 2> /dev/null | sed -r 's/([^0-9]*([0-9]*)){1}.*/\2/')
     echo "*** Detected Distro is ${RHTEST} - ${RHVERSION} ***"
 
     echo "Restarting MongoDB..."
@@ -54,8 +54,8 @@ if [[ -n "$RHTEST" ]]; then
     git clone --branch add_per_test_timing_information --depth 1 https://github.com/Kami/bats-core.git
     (cd bats-core; sudo ./install.sh /usr/local)
 elif [[ -n "$DEBTEST" ]]; then
-    DEBVERSION=`lsb_release --release | awk '{ print $2 }'`
-    SUBTYPE=`lsb_release -a 2>&1 | grep Codename | grep -v "LSB" | awk '{print $2}'`
+    DEBVERSION=$(lsb_release --release | awk '{ print $2 }')
+    SUBTYPE=$(lsb_release -a 2>&1 | grep Codename | grep -v "LSB" | awk '{print $2}')
     echo "*** Detected Distro is ${DEBTEST} - ${DEBVERSION} ***"
 
     echo "Restarting MongoDB..."
@@ -112,11 +112,11 @@ fi
 
 # Install packs for testing
 if [[ ${BRANCH} == "master" ]]; then
-    echo "Installing st2tests from '${BRANCH}' branch at location: `pwd`..."
+    echo "Installing st2tests from '${BRANCH}' branch at location: $(pwd)..."
     # Can use --recurse-submodules with Git 2.13 and later
     git clone --recursive -b ${BRANCH} --depth 1 https://github.com/StackStorm/st2tests.git
 else
-    echo "Installing st2tests from 'v${BRANCH}' branch at location: `pwd`"
+    echo "Installing st2tests from 'v${BRANCH}' branch at location: $(pwd)"
     # Can use --recurse-submodules with Git 2.13 and later
     git clone --recursive -b v${BRANCH} --depth 1 https://github.com/StackStorm/st2tests.git
 fi