From 23a908e37128638e245d2809387a309d0a9690c9 Mon Sep 17 00:00:00 2001 From: Teja Swaroop Pothala Date: Fri, 1 Nov 2024 18:31:51 +0530 Subject: [PATCH] Ignored installing software-properties-common for kali-rolling in release/1.16.0 --- src/ubuntu/install/tools/install_tools.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/ubuntu/install/tools/install_tools.sh b/src/ubuntu/install/tools/install_tools.sh index 962b416..18cee00 100644 --- a/src/ubuntu/install/tools/install_tools.sh +++ b/src/ubuntu/install/tools/install_tools.sh @@ -34,7 +34,13 @@ else apt-get update # Update tzdata noninteractive (otherwise our script is hung on user input later). DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get -y install tzdata - apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl software-properties-common mesa-utils bc + + # software-properties is removed from kali-rolling + if grep -q "kali-rolling" /etc/os-release; then + apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl mesa-utils bc + else + apt-get install ${PARROTEXTRA} -y vim wget net-tools locales bzip2 wmctrl software-properties-common mesa-utils bc + fi echo "generate locales for en_US.UTF-8" locale-gen en_US.UTF-8