From 59a844f2c749e748b8b09b15432a1c31a51d47c0 Mon Sep 17 00:00:00 2001 From: Frank Brehm Date: Thu, 29 Dec 2022 12:20:37 +0100 Subject: [PATCH] Fixing gitlab/python-setup-template.yaml --- gitlab/python-setup-template.yaml | 48 +++++++++++++++---------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gitlab/python-setup-template.yaml b/gitlab/python-setup-template.yaml index 609720e..423e145 100644 --- a/gitlab/python-setup-template.yaml +++ b/gitlab/python-setup-template.yaml @@ -4,16 +4,16 @@ 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 @@ -34,34 +34,34 @@ 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 - fi + 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" # vim: et tabstop=2 expandtab shiftwidth=2 softtabstop=2 list -- 2.39.5