Skip to content

Commit 040f1d1

Browse files
committed
Fix SC2006 warnings
1 parent cab83c5 commit 040f1d1

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

ms-windows/mxe/build-mxe.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ PYDEPLOY=${DIR}/deploy.py
3535
MXE=${HOME}/dev/mxe/
3636

3737
# Directory for build
38-
BUILD_DIR=`pwd`/build-mxe
38+
BUILD_DIR=$(pwd)/build-mxe
3939
# Directory where the artifact will be saved
40-
RELEASE_DIR=`pwd`/release-mxe
40+
RELEASE_DIR=$(pwd)/release-mxe
4141

4242
# End configuration
4343

@@ -97,7 +97,7 @@ __TXT__
9797
# Make the zip
9898

9999
cd ${RELEASE_DIR}/..
100-
ZIP_NAME=mxe-release-`date +%Y-%m-%d-%H-%I-%S`.zip
100+
ZIP_NAME=mxe-release-$(date +%Y-%m-%d-%H-%I-%S).zip
101101
zip -r ${ZIP_NAME} $(basename ${RELEASE_DIR})
102102
cp ${ZIP_NAME} ${DIR}
103103

scripts/build_debian_package.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
###########################################################################
1616

1717
set -x
18-
if [ -d `pwd`/src ]
18+
if [ -d $(pwd)/src ]
1919
then
2020
#src exists so we are prolly in the right dir
2121
echo "good we are in qgis checkout dir!"
@@ -24,7 +24,7 @@ else
2424
exit 1
2525
fi
2626

27-
if [ -d `pwd`/debian ]
27+
if [ -d $(pwd)/debian ]
2828
then
2929
cd debian || exit
3030
svn update

scripts/remove_non_svn_files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# deleting each file.
2222
#
2323

24-
for FILE in `svn status |grep "^?" | awk '{print $2}'`;do rm -i -r $FILE; done
24+
for FILE in $(svn status |grep "^?" | awk '{print $2}');do rm -i -r $FILE; done

tests/code_layout/test_shellcheck.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
DIR=$(git rev-parse --show-toplevel)
66

77
pushd ${DIR} > /dev/null || exit
8-
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'))
8+
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'))
99
popd > /dev/null || exit
1010

1111
if [[ $result ]]; then

0 commit comments

Comments
 (0)