Skip to content

Commit b7e5556

Browse files
committed
Shellcheck
1 parent 99f7236 commit b7e5556

File tree

2 files changed

+18
-15
lines changed

2 files changed

+18
-15
lines changed

docker/qgis_resources/test_runner/qgis_setup.sh

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -51,32 +51,35 @@ cp /usr/bin/qgis_startup.py ${STARTUP_MASTER_FOLDER}/startup.py
5151
printf "[Qgis]\n" >> $CONF_FILE
5252
# !!!! Note that on master it is lowercase !!!!
5353
printf "[qgis]\n" >> $CONF_MASTER_FILE
54-
SHOW_TIPS=`qgis --help 2>&1 | head -2 | grep 'QGIS - ' | perl -npe 'chomp; s/QGIS - (\d+)\.(\d+).*/showTips\1\2=false/'`
55-
printf "$SHOW_TIPS\n\n" >> $CONF_FILE
56-
printf "$SHOW_TIPS\n\n" >> $CONF_MASTER_FILE
54+
SHOW_TIPS=$(qgis --help 2>&1 | head -2 | grep 'QGIS - ' | perl -npe 'chomp; s/QGIS - (\d+)\.(\d+).*/showTips\1\2=false/')
55+
printf "%s\n\n" "$SHOW_TIPS" >> $CONF_FILE
56+
printf "%s\n\n" "$SHOW_TIPS" >> $CONF_MASTER_FILE
5757

5858
if [ -n "$PLUGIN_NAME" ]; then
5959
# Enable plugin
6060
printf '[PythonPlugins]\n' >> $CONF_FILE
61-
printf "${PLUGIN_NAME}=true\n\n" >> $CONF_FILE
61+
printf "%s=true\n\n" "$PLUGIN_NAME" >> $CONF_FILE
6262

6363
printf '[PythonPlugins]\n' >> $CONF_MASTER_FILE
64-
printf "${PLUGIN_NAME}=true\n\n" >> $CONF_MASTER_FILE
64+
printf "%s=true\n\n" "$PLUGIN_NAME" >> $CONF_MASTER_FILE
6565
fi
6666

6767
# Disable firstRunVersionFlag for master
68-
printf "\n[migration]\n" >> $CONF_MASTER_FILE
69-
printf "fileVersion=2\n" >> $CONF_MASTER_FILE
70-
printf "firstRunVersionFlag=29900\n" >> $CONF_MASTER_FILE
71-
printf "settings=true\n\n" >> $CONF_MASTER_FILE
68+
{
69+
printf
70+
"\n[migration]\n"
71+
"fileVersion=2\n"
72+
"firstRunVersionFlag=29900\n"
73+
"settings=true\n\n"
74+
} >> $CONF_MASTER_FILE
7275

7376

7477
# Install the plugin
7578
if [ ! -L "${PLUGIN_FOLDER}/${PLUGIN_NAME}" ]; then
76-
ln -s /tests_directory/${PLUGIN_NAME} ${PLUGIN_FOLDER}
79+
ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_FOLDER}"
7780
echo "Plugin folder linked in ${PLUGIN_FOLDER}/${PLUGIN_NAME}"
7881
fi
7982
if [ ! -d "${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}" ]; then
80-
ln -s /tests_directory/${PLUGIN_NAME} ${PLUGIN_MASTER_FOLDER}
83+
ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_MASTER_FOLDER}"
8184
echo "Plugin master folder linked in ${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}"
8285
fi

docker/qgis_resources/test_runner/qgis_testrunner.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ TEST_NAME=$1
77

88
cd /tests_directory
99
echo "Running test $1 ..."
10-
OUTPUT=$(QGIS_TEST_MODULE=${TEST_NAME} unbuffer qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py $TEST_NAME 2>/dev/null | tee /dev/tty)
10+
OUTPUT=$(QGIS_TEST_MODULE=${TEST_NAME} unbuffer qgis --version-migration --nologo --code /usr/bin/qgis_testrunner.py "$TEST_NAME" 2>/dev/null | tee /dev/tty)
1111
EXIT_CODE="$?"
1212
if [ -z "$OUTPUT" ]; then
1313
echo "ERROR: no output from the test runner! (exit code: ${EXIT_CODE})"
1414
exit 1
1515
fi
16-
echo $OUTPUT | grep -q FAILED
16+
echo "$OUTPUT" | grep -q FAILED
1717
IS_FAILED="$?"
18-
echo $OUTPUT | grep OK | grep -q 'Ran'
18+
echo "$OUTPUT" | grep OK | grep -q 'Ran'
1919
IS_PASSED="$?"
20-
echo $OUTPUT | grep "QGIS died on signal"
20+
echo "$OUTPUT" | grep "QGIS died on signal"
2121
IS_DEAD="$?"
2222
echo "Finished running test $1."
2323
if [ "$IS_PASSED" -eq "0" ] && [ "$IS_FAILED" -eq "1" ] && [ "$IS_DEAD" -eq "1" ]; then

0 commit comments

Comments
 (0)