Skip to content
Permalink
Browse files

Fix SC2103 warnings

  • Loading branch information
nyalldawson committed Jun 21, 2018
1 parent 040f1d1 commit 0e9a3815342c4154a02d9865fdee26f4bccfb8b5
Showing with 13 additions and 11 deletions.
  1. +6 −5 scripts/update_ts.sh
  2. +6 −5 scripts/update_ts_files.sh
  3. +1 −1 tests/code_layout/test_shellcheck.sh
@@ -134,11 +134,12 @@ elif [ $action = pull ]; then
fi

echo Updating python translations
cd python
pylupdate5 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
rm python-i18n.ts
cd ..
(
cd python
pylupdate5 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
rm python-i18n.ts
)
for i in python/plugins/*/CMakeLists.txt; do
cd ${i%/*}
cat <<EOF >python-i18n.pro
@@ -110,11 +110,12 @@ if [ ! -f "$builddir/src/core/qgsexpression_texts.cpp" ]; then
fi

echo Updating python translations
cd python
pylupdate5 utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
rm python-i18n.ts
cd ..
(
cd python
pylupdate5 utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
rm python-i18n.ts
)
for i in python/plugins/*/CMakeLists.txt; do
cd ${i%/*}
pylupdate5 $(find . -name "*.py" -o -name "*.ui") -ts python-i18n.ts
@@ -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,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,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

0 comments on commit 0e9a381

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