Fix SC2006 warnings

qgis · Jun 21, 2018 · 040f1d1 · 040f1d1
1 parent cab83c5
commit 040f1d1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/ms-windows/mxe/build-mxe.sh b/ms-windows/mxe/build-mxe.sh
@@ -35,9 +35,9 @@ PYDEPLOY=${DIR}/deploy.py
 MXE=${HOME}/dev/mxe/
 
 # Directory for build
-BUILD_DIR=`pwd`/build-mxe
+BUILD_DIR=$(pwd)/build-mxe
 # Directory where the artifact will be saved
-RELEASE_DIR=`pwd`/release-mxe
+RELEASE_DIR=$(pwd)/release-mxe
 
 # End configuration
 
@@ -97,7 +97,7 @@ __TXT__
 # Make the zip
 
 cd ${RELEASE_DIR}/..
-ZIP_NAME=mxe-release-`date +%Y-%m-%d-%H-%I-%S`.zip
+ZIP_NAME=mxe-release-$(date +%Y-%m-%d-%H-%I-%S).zip
 zip -r ${ZIP_NAME} $(basename ${RELEASE_DIR})
 cp ${ZIP_NAME} ${DIR}
 

diff --git a/scripts/build_debian_package.sh b/scripts/build_debian_package.sh
@@ -15,7 +15,7 @@
 ###########################################################################
 
 set -x
-if [ -d `pwd`/src ]
+if [ -d $(pwd)/src ]
 then
   #src exists so we are prolly in the right dir
   echo "good we are in  qgis checkout dir!"
@@ -24,7 +24,7 @@ else
   exit 1
 fi
 
-if [ -d `pwd`/debian ]
+if [ -d $(pwd)/debian ]
 then
   cd debian || exit
   svn update

diff --git a/scripts/remove_non_svn_files.sh b/scripts/remove_non_svn_files.sh
@@ -21,4 +21,4 @@
 # deleting each file.
 #
 
-for FILE in `svn status |grep "^?" | awk '{print $2}'`;do rm -i -r $FILE; done
+for FILE in $(svn status |grep "^?" | awk '{print $2}');do rm -i -r $FILE; done
diff --git a/tests/code_layout/test_shellcheck.sh b/tests/code_layout/test_shellcheck.sh
@@ -5,7 +5,7 @@
 DIR=$(git rev-parse --show-toplevel)
 
 pushd ${DIR} > /dev/null || exit
-result=$(shellcheck -e SC2016,SC2015,SC2086,SC2002,SC1117,SC2154,SC2076,SC2046,SC1090,SC2038,SC2031,SC2030,SC2162,SC2196,SC2034,SC2044,SC2119,SC1001,SC2188,SC2119,SC2188,SC2120,SC2103,SC2059,SC2006,SC2221,SC2128,SC2005,SC2013,SC2027,SC2090,SC2089,SC2124,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2045,SC2028,SC1091,SC1083 $(find . -name '*.sh'))
+result=$(shellcheck -e SC2016,SC2015,SC2086,SC2002,SC1117,SC2154,SC2076,SC2046,SC1090,SC2038,SC2031,SC2030,SC2162,SC2196,SC2034,SC2044,SC2119,SC1001,SC2188,SC2119,SC2188,SC2120,SC2103,SC2059,SC2128,SC2005,SC2013,SC2027,SC2090,SC2089,SC2124,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2045,SC2028,SC1091,SC1083 $(find . -name '*.sh'))
 popd > /dev/null || exit
 
 if [[ $result ]]; then