From a08ed732e9f2e136bef5545b1602b254eb8c049b Mon Sep 17 00:00:00 2001 From: Alexandre <44178713+alexbelgium@users.noreply.github.com> Date: Fri, 21 Jan 2022 17:03:26 +0100 Subject: [PATCH] Update automatic_packages.sh --- .templates/automatic_packages.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.templates/automatic_packages.sh b/.templates/automatic_packages.sh index 12fbfb4b0..1f723554d 100644 --- a/.templates/automatic_packages.sh +++ b/.templates/automatic_packages.sh @@ -11,7 +11,7 @@ set +u 2>/dev/null || true #If no packages, empty PACKAGES="${*:-}" #Avoids messages if non interactive -(echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections) >/dev/null || true +(echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections) &>/dev/null || true [ "$VERBOSE" = true ] && echo "ENV : $PACKAGES" @@ -43,7 +43,7 @@ PACKAGES="$PACKAGES jq curl vim" ################################## # Scripts -for files in "/etc/cont-init.d" "/etc/services.d" "/scripts"; do +for files in "/etc/cont-init.d" "/etc/services.d"; do # Next directory if does not exists if ! ls $files 1>/dev/null 2>&1; then continue; fi @@ -164,7 +164,7 @@ fi # INSTALL MANUAL APPS # ####################### -for files in "/scripts" "/etc/services.d" "/etc/cont-init.d"; do +for files in "/etc/services.d" "/etc/cont-init.d"; do # Next directory if does not exists if ! ls $files 1>/dev/null 2>&1; then continue; fi @@ -181,9 +181,10 @@ for files in "/scripts" "/etc/services.d" "/etc/cont-init.d"; do fi # Lastversion - if grep -q -rnw "$files/" -e 'lastversion'; then - [ "$VERBOSE" = true ] && echo "install lastversion" - pip install lastversion + COMMAND="lastversion" + if grep -q -rnw "$files/" -e "$COMMAND" && ! command -v $COMMAND &>/dev/null; then + [ "$VERBOSE" = true ] && echo "install $COMMAND" + pip install $COMMAND fi # Tempio