From 8db3147a833bab5b685ffbba91f3acd2b81e274e Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Thu, 29 Dec 2022 12:54:54 +0100
Subject: [PATCH] Fixing multiline blocks in gitlab/python-setup-template.yaml

---
 gitlab/python-setup-template.yaml | 66 +++++++++++++++----------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/gitlab/python-setup-template.yaml b/gitlab/python-setup-template.yaml
index 423e145..927f163 100644
--- a/gitlab/python-setup-template.yaml
+++ b/gitlab/python-setup-template.yaml
@@ -3,64 +3,64 @@
 .setup-python-environment:
   before_script:
     - locale -a
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):apt_update[collapsed=true]\r\e[0KAPT update ...";
-      apt update;
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):apt_update[collapsed=true]\r\e[0KAPT update ..."
+      apt update
       echo -e "\e[0Ksection_end:$( date +%s ):apt_update\r\e[0K"
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):dist_upgrade[collapsed=true]\r\e[0KAPT dist-upgrade ...";
-      apt dist-upgrade --yes;
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):dist_upgrade[collapsed=true]\r\e[0KAPT dist-upgrade ..."
+      apt dist-upgrade --yes
       echo -e "\e[0Ksection_end:$( date +%s ):dist_upgrade\r\e[0K"
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):install_additional[collapsed=true]\r\e[0KInstalling additional packages ...";
-      apt install --yes --no-install-recommends sudo locales gettext;
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):install_additional[collapsed=true]\r\e[0KInstalling additional packages ..."
+      apt install --yes --no-install-recommends sudo locales gettext
       echo -e "\e[0Ksection_end:$( date +%s ):install_additional\r\e[0K"
-    - >
+    - |
       if test -f /etc/locale.gen; then
         echo "/etc/locale.gen:"
         grep -P -v '^\s*(#.*)?$' /etc/locale.gen || true
         echo "<-- EOF"
       fi
-    - >
+    - |
       if grep 'en_US.UTF-8' /etc/locale.gen; then
         sed -i -e 's/# en_US.UTF-8 UTF-8/en_US.UTF-8 UTF-8/' /etc/locale.gen
       else
         echo 'en_US.UTF-8 UTF-8' >> /etc/locale.gen
       fi
-    - >
+    - |
       if grep 'de_DE.UTF-8' /etc/locale.gen; then
         sed -i -e 's/# de_DE.UTF-8 UTF-8/de_DE.UTF-8 UTF-8/' /etc/locale.gen
       else
         echo 'de_DE.UTF-8 UTF-8' >> /etc/locale.gen
       fi
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):locale_gen[collapsed=true]\r\e[0KGenerate locales ...";
-      locale-gen;
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):locale_gen[collapsed=true]\r\e[0KGenerate locales ..."
+      locale-gen
       echo -e "\e[0Ksection_end:$( date +%s ):locale_gen\r\e[0K"
     - locale -a
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):update_pip[collapsed=true]\r\e[0KUpdating pip via pip ...";
-      pip install --upgrade pip;
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):update_pip[collapsed=true]\r\e[0KUpdating pip via pip ..."
+      pip install --upgrade pip
       echo -e "\e[0Ksection_end:$( date +%s ):update_pip\r\e[0K"
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):update_outdated[collapsed=true]\r\e[0KUpdating Outdated pip modules ...";
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):update_outdated[collapsed=true]\r\e[0KUpdating Outdated pip modules ..."
       if [[ -n "${UPDATE_ALL_PIP_MODULES}" && "${UPDATE_ALL_PIP_MODULES}" == "y" ]] ; then
-          echo ' ';
-          echo "Updating all outdated PIP modules.";
+          echo ' '
+          echo "Updating all outdated PIP modules."
           for module in $( pip list --outdated | awk '{if(NR>=3) print $1}'  ); do
-              echo ' ';
-              echo "Updating module '${module}' ...";
-              pip install --upgrade "${module}";
-          done;
-          echo ' ';
-      fi;
+              echo
+              echo "Updating module '${module}' ..."
+              pip install --upgrade "${module}"
+          done
+          echo
+      fi
       echo -e "\e[0Ksection_end:$( date +%s ):update_outdated\r\e[0K"
-    - >
-      echo -e "\e[0Ksection_start:$( date +%s ):install_requirements[collapsed=true]\r\e[0KInstalling required pip modules ...";
+    - |
+      echo -e "\e[0Ksection_start:$( date +%s ):install_requirements[collapsed=true]\r\e[0KInstalling required pip modules ..."
       if [[ -r requirements.txt ]] ; then
-          echo ' ';
-          echo "Installing all required PIP modules.";
-          pip install -r requirements.txt --upgrade --upgrade-strategy eager;
+          echo ' '
+          echo "Installing all required PIP modules."
+          pip install -r requirements.txt --upgrade --upgrade-strategy eager
       fi;
       echo -e "\e[0Ksection_end:$( date +%s ):install_requirements\r\e[0K"
 
-- 
2.39.5