From 555bf2245dfed17cea026cad6bc6128aca19a63b Mon Sep 17 00:00:00 2001 From: t3chn0m4g3 Date: Fri, 8 Apr 2022 15:03:59 +0000 Subject: [PATCH] fix installer path to packages.txt --- bin/tpdclean.sh | 1 + iso/installer/install.sh | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/bin/tpdclean.sh b/bin/tpdclean.sh index 1c816886..7ae50398 100755 --- a/bin/tpdclean.sh +++ b/bin/tpdclean.sh @@ -25,4 +25,5 @@ docker network rm $(docker network ls -q) >> /dev/null 2>&1 docker volume rm $(docker volume ls -q) >> /dev/null 2>&1 docker rm -v $(docker ps -aq) >> /dev/null 2>&1 docker rmi $(docker images | grep "" | awk '{print $3}') >> /dev/null 2>&1 +docker rmi $(docker images | grep "2203" | awk '{print $3}') >> /dev/null 2>&1 exit 0 diff --git a/iso/installer/install.sh b/iso/installer/install.sh index c7b4b55e..1d422b0b 100755 --- a/iso/installer/install.sh +++ b/iso/installer/install.sh @@ -22,7 +22,12 @@ myLSB_STABLE_SUPPORTED="bullseye" myLSB_TESTING_SUPPORTED="stable" myREMOTESITES="https://hub.docker.com https://github.com https://pypi.python.org https://debian.org https://listbot.sicherheitstacho.eu" myPREINSTALLPACKAGES="aria2 apache2-utils cracklib-runtime curl dialog figlet fuse grc libcrack2 libpq-dev lsb-release net-tools software-properties-common toilet" -myINSTALLPACKAGES=$(cat /opt/tpot/packages.txt) +if [ -f "../../packages.txt" ]; + then myINSTALLPACKAGESFILE="../../packages.txt" +elif [ -f "/opt/tpot/packages.txt" ]; + then myINSTALLPACKAGESFILE="/opt/tpot/packages.txt" +fi +myINSTALLPACKAGES=$(cat $myINSTALLPACKAGESFILE) myINFO="\ ########################################### ### T-Pot Installer for Debian (Stable) ###