Fix SC2181 warnings

qgis · Jun 21, 2018 · 6c9484b · 6c9484b
1 parent 36e3821
commit 6c9484b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/rpm/buildrpms.sh b/rpm/buildrpms.sh
@@ -135,12 +135,11 @@ then
 
   print_info "Creating source package"
   # Build source package
-  mock --buildsrpm --spec qgis.spec --sources ./sources \
+  if mock --buildsrpm --spec qgis.spec --sources ./sources \
     --define "_relver $relver" \
     --define "_version $version" \
     --define "_timestamp $timestamp" \
-    --resultdir=$OUTDIR $mock_args
-  if [ $? -ne 0 ]
+    --resultdir=$OUTDIR $mock_args -ne 0;
   then
     print_error "Creating source package failed"
     exit 1
@@ -167,12 +166,12 @@ do :
     rm $OUTDIR/$arch/build.log
   fi
   mkdir $OUTDIR/$arch
-  mock -r $arch --rebuild $OUTDIR/$srpm \
+
+  if mock -r $arch --rebuild $OUTDIR/$srpm \
     --define "_relver $relver" \
     --define "_version $version" \
     --define "_timestamp $timestamp" \
-    --resultdir=$OUTDIR/$arch $mock_args
-  if [  $? -eq 0 ]
+    --resultdir=$OUTDIR/$arch $mock_args -eq 0;
   then
     # Add to package list
     packages="$packages $(ls $OUTDIR/$arch/*-$version-$relver.*.rpm)"

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,SC2222,SC2120,SC2128,SC2005,SC2004,SC2013,SC2027,SC2090,SC2089,SC2124,SC2068,SC2035,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2062,SC2045,SC2028,SC1091,SC2181,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,SC2006,SC2221,SC2222,SC2120,SC2128,SC2005,SC2004,SC2013,SC2027,SC2090,SC2089,SC2124,SC2068,SC2035,SC2001,SC2010,SC1072,SC1073,SC1009,SC2166,SC2062,SC2045,SC2028,SC1091,SC1083 $(find . -name '*.sh'))
 popd > /dev/null || exit
 
 if [[ $result ]]; then