SC2003: expr is antiquated. Consider rewriting this using $((..)), ${} or [[ ]].

m-kuhn · nyalldawson · commit 5e3ce8ff6ac5 · 2018-06-01T08:25:46.000+10:00
diff --git a/.ci/travis/linux/docker-build-test.sh b/.ci/travis/linux/docker-build-test.sh
@@ -71,7 +71,7 @@ echo "travis_fold:end:cmake"
 TRAVIS_TIME=120
 UPLOAD_TIME=5
 CURRENT_TIME=$(date +%s)
-TIMEOUT=$(expr \( ${TRAVIS_TIME} - ${UPLOAD_TIME} \) \* 60 - ${CURRENT_TIME} + ${TRAVIS_TIMESTAMP})
+TIMEOUT=$((( ${TRAVIS_TIME} - ${UPLOAD_TIME} ) * 60 - ${CURRENT_TIME} + ${TRAVIS_TIMESTAMP}))
 TIMEOUT=$(( ${TIMEOUT} < 300 ? 300 : ${TIMEOUT} ))
 echo "Timeout: ${TIMEOUT}s (started at ${TRAVIS_TIMESTAMP}, current: ${CURRENT_TIME})"
 
@@ -108,7 +108,7 @@ popd > /dev/null # /root/QGIS
 # Run tests
 ###########
 CURRENT_TIME=$(date +%s)
-TIMEOUT=$(expr \( ${TRAVIS_TIME} - ${UPLOAD_TIME} \) \* 60 - ${CURRENT_TIME} + ${TRAVIS_TIMESTAMP})
+TIMEOUT=$((( ${TRAVIS_TIME} - ${UPLOAD_TIME}) * 60 - ${CURRENT_TIME} + ${TRAVIS_TIMESTAMP}))
 echo "Timeout: ${TIMEOUT}s (started at ${TRAVIS_TIMESTAMP}, current: ${CURRENT_TIME})"
 timeout ${TIMEOUT}s python3 /root/QGIS/.ci/travis/scripts/ctest2travis.py xvfb-run ctest -V -E "$(cat /root/QGIS/.ci/travis/linux/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" -S /root/QGIS/.ci/travis/travis.ctest --output-on-failure
 rv=$?
diff --git a/.ci/travis/macos/script.sh b/.ci/travis/macos/script.sh
@@ -27,7 +27,7 @@ ccache -z
 #
 # Travis will kill the job after approx 48 minutes, we subtract 8 minutes for
 # uploading and initialization (40) and subtract the bootstrapping time from that.
-TIMEOUT=$(expr 40 \* 60 - "$(date +%s)" + "$(cat /tmp/travis_timestamp)")
+TIMEOUT=$((40 * 60 - $(date +%s) + $(cat /tmp/travis_timestamp)))
 
 export CTEST_BUILD_COMMAND=/usr/local/bin/ninja
 export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}
diff --git a/scripts/qgis_srs.sh b/scripts/qgis_srs.sh
@@ -201,7 +201,7 @@ for i in $(awk 'NR>1' ${gdal_share}/pcs.csv | cut -d, -f1); do
 
   if [ -n "$raw" ]; then
 
-   no=$(expr $no + 1)
+   no=$(($no + 1))
    name=$(echo $raw | sed 's/^# //' | grep -o "^.\{1,\} <[[:digit:]]\{1,\}>" | sed 's/ <[[:digit:]]\{1,\}>//' | sed "s/'/''/g")
    proj=$(echo $raw | grep -o "+proj=[^[:space:]]\{1,\}" | cut -d"=" -f2)
    ellps=$(echo $raw | grep -o "+ellps=[^[:space:]]\{1,\}" | cut -d"=" -f2)
@@ -224,7 +224,7 @@ for i in $(awk 'NR>1' ${gdal_share}/gcs.csv | cut -d, -f1); do
 
   if [ -n "$raw" ]; then
 
-   no=$(expr $no + 1)
+   no=$(($no + 1))
    name=$(echo $raw | sed 's/^# //' | grep -o "^.\{1,\} <[[:digit:]]\{1,\}>" | sed 's/ <[[:digit:]]\{1,\}>//' | sed "s/'/''/g")
    proj=$(echo $raw | grep -o "+proj=[^[:space:]]\{1,\}" | cut -d"=" -f2)
    ellps=$(echo $raw | grep -o "+ellps=[^[:space:]]\{1,\}" | cut -d"=" -f2)
diff --git a/scripts/sipdiff b/scripts/sipdiff
@@ -16,7 +16,7 @@ while getopts ":s" opt; do
       ;;
   esac
 done
-shift $(expr $OPTIND - 1)
+shift $(($OPTIND - 1))
 
 
 

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ ccache -z`
`27`	`27`	`#`
`28`	`28`	`# Travis will kill the job after approx 48 minutes, we subtract 8 minutes for`
`29`	`29`	`# uploading and initialization (40) and subtract the bootstrapping time from that.`
`30`		`-TIMEOUT=$(expr 40 \* 60 - "$(date +%s)" + "$(cat /tmp/travis_timestamp)")`
	`30`	`+TIMEOUT=$((40 * 60 - $(date +%s) + $(cat /tmp/travis_timestamp)))`
`31`	`31`
`32`	`32`	`export CTEST_BUILD_COMMAND=/usr/local/bin/ninja`
`33`	`33`	`export CTEST_BUILD_DIR=${TRAVIS_BUILD_DIR}`