From 6dab714e03ee17b2d909cb2b8f8cfd9583bb2f7e Mon Sep 17 00:00:00 2001
From: Alessandro Pasotti <elpaso@itopen.it>
Date: Wed, 28 Nov 2018 17:13:45 +0100
Subject: [PATCH] Fix ini file creation

---
 .../qgis_resources/test_runner/qgis_setup.sh  | 27 +++++++++----------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/.docker/qgis_resources/test_runner/qgis_setup.sh b/.docker/qgis_resources/test_runner/qgis_setup.sh
index 6d1a8a44502..91df75bf267 100644
--- a/.docker/qgis_resources/test_runner/qgis_setup.sh
+++ b/.docker/qgis_resources/test_runner/qgis_setup.sh
@@ -8,7 +8,7 @@
 # - create the folders
 # - install startup.py monkey patches
 # - disable tips
-# - enable the plugin
+# - enable the plugin (optionally)
 
 PLUGIN_NAME=$1
 CONF_MASTER_FOLDER="/root/.local/share/QGIS/QGIS3/profiles/default/QGIS/"
@@ -42,20 +42,17 @@ if [ -n "$PLUGIN_NAME" ]; then
     # Enable plugin
     printf '[PythonPlugins]\n' >> $CONF_MASTER_FILE
     printf "%s=true\n\n" "$PLUGIN_NAME" >> $CONF_MASTER_FILE
+    # Install the plugin
+    if [ ! -d "${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}" ]; then
+        ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_MASTER_FOLDER}"
+        echo "Plugin master folder linked in ${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}"
+    fi
 fi
 
 # Disable firstRunVersionFlag for master
-{
-    printf
-    "\n[migration]\n"
-    "fileVersion=2\n"
-    "firstRunVersionFlag=30500\n"
-    "settings=true\n\n"
-} >> $CONF_MASTER_FILE
-
-
-# Install the plugin
-if [ ! -d "${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}" ]; then
-    ln -s "/tests_directory/${PLUGIN_NAME}" "${PLUGIN_MASTER_FOLDER}"
-    echo "Plugin master folder linked in ${PLUGIN_MASTER_FOLDER}/${PLUGIN_NAME}"
-fi
+echo "
+[migration]
+fileVersion=2
+firstRunVersionFlag=30500
+settings=true
+" >> $CONF_MASTER_FILE