Skip to content

Commit 0e9a381

Browse files
committed
Fix SC2103 warnings
1 parent 040f1d1 commit 0e9a381

File tree

3 files changed

+13
-11
lines changed

3 files changed

+13
-11
lines changed

scripts/update_ts.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -134,11 +134,12 @@ elif [ $action = pull ]; then
134134
fi
135135

136136
echo Updating python translations
137-
cd python
138-
pylupdate5 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
139-
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
140-
rm python-i18n.ts
141-
cd ..
137+
(
138+
cd python
139+
pylupdate5 user.py utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
140+
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
141+
rm python-i18n.ts
142+
)
142143
for i in python/plugins/*/CMakeLists.txt; do
143144
cd ${i%/*}
144145
cat <<EOF >python-i18n.pro

scripts/update_ts_files.sh

+6-5
Original file line numberDiff line numberDiff line change
@@ -110,11 +110,12 @@ if [ ! -f "$builddir/src/core/qgsexpression_texts.cpp" ]; then
110110
fi
111111

112112
echo Updating python translations
113-
cd python
114-
pylupdate5 utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
115-
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
116-
rm python-i18n.ts
117-
cd ..
113+
(
114+
cd python
115+
pylupdate5 utils.py {console,pyplugin_installer}/*.{py,ui} -ts python-i18n.ts
116+
perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
117+
rm python-i18n.ts
118+
)
118119
for i in python/plugins/*/CMakeLists.txt; do
119120
cd ${i%/*}
120121
pylupdate5 $(find . -name "*.py" -o -name "*.ui") -ts python-i18n.ts

tests/code_layout/test_shellcheck.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
DIR=$(git rev-parse --show-toplevel)
66

77
pushd ${DIR} > /dev/null || exit
8-
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'))
8+
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'))
99
popd > /dev/null || exit
1010

1111
if [[ $result ]]; then

0 commit comments

Comments
 (0)