sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-10-09 00:08:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix SC2103 warnings

Browse Source
This commit is contained in:
Nyall Dawson 2018-06-21 12:21:08 +10:00
parent 040f1d1879
commit 0e9a381534
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/update_ts.sh
View File

@ -134,11 +134,12 @@ elif [ $action = pull ]; then
fi fi
echo Updating python translations echo Updating python translations
cd python (
pylupdate5 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts cd python
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp pylupdate5 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
rm python-i18n.ts perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
cd .. rm python-i18n.ts
)
for i in python/plugins/*/CMakeLists.txt; do for i in python/plugins/*/CMakeLists.txt; do
cd ${i%/*} cd ${i%/*}
cat <<EOF >python-i18n.pro cat <<EOF >python-i18n.pro

11
scripts/update_ts_files.sh
View File

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

2
tests/code_layout/test_shellcheck.sh
View File

@ -5,7 +5,7 @@
DIR=$(git rev-parse --show-toplevel) DIR=$(git rev-parse --show-toplevel)
pushd ${DIR} > /dev/null || exit 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 popd > /dev/null || exit
if [[ $result ]]; then if [[ $result ]]; then