Skip to content
Permalink
Browse files

Fix SC2034 warnings

  • Loading branch information
nyalldawson committed Jun 21, 2018
1 parent 5b375a2 commit 4778498c94a2a0081e5767f1afd5dd0881a2dcd4
@@ -15,7 +15,6 @@
###########################################################################


PYUIC=$1
LD_LIBRARY_PATH=$2:$LD_LIBRARY_PATH
PYTHONPATH=$3:$PYTHONPATH
PYTHON=$4
@@ -3,7 +3,6 @@
set -e

codepaths=$(echo python/{analysis,console,core,custom_widgets,gui,plugins,pyplugin_installer,server,sip_helpers,testing} src/ tests/)
repl=

s=$(mktemp -t skipped.XXXX.log)
r=$(mktemp -t repl.XXXX.pl)
@@ -2,8 +2,5 @@
DIR=$(git rev-parse --show-toplevel)
cd $1 || exit
FOLDER=linux
if [[ "$OSTYPE" =~ darwin* ]]; then
GP=linux
fi
ctest -E "$(cat ${DIR}/.ci/travis/${FOLDER}/blacklist.txt | sed -r '/^(#.*?)?$/d' | paste -sd '|' -)" --output-on-failure
cd $DIR || exit
@@ -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,SC2120,SC2059,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,SC2044,SC2119,SC1001,SC2120,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
@@ -3,12 +3,6 @@
DIR=$(git rev-parse --show-toplevel)
REV=$(git log -n1 --pretty=%H)

# GNU prefix command for mac os support (gsed, gsplit)
GP=
if [[ "$OSTYPE" =~ darwin* ]]; then
GP=g
fi

pushd ${DIR} > /dev/null || exit

code=0
@@ -22,7 +22,7 @@ DAEMON=$2
NAME=spawn-fcgi
DESC="$NAME"
TEMPDIR=$5
FCGI=qgis_mapserv
#FCGI=qgis_mapserv
PIDFILE=$TEMPDIR/var/$NAME.pid
FCGISOCKET=$3
FCGIBIN=$4

0 comments on commit 4778498

Please sign in to comment.
You can’t perform that action at this time.