diff --git a/scripts/subinstallers/cockpit.sh b/scripts/subinstallers/cockpit.sh index 1a9d7f5..445ea69 100755 --- a/scripts/subinstallers/cockpit.sh +++ b/scripts/subinstallers/cockpit.sh @@ -17,11 +17,11 @@ elif [ "$DISTRO" == "raspbian" ]; then fi -sudo apt-get install -y cockpit +sudo -E apt-get install -y cockpit if $(sudo apt-cache show cockpit-docker > /dev/null 2>&1) ; then # no longer supported upstream in Ubuntu 20.04 - sudo apt-get install -y cockpit-docker + sudo -E apt-get install -y cockpit-docker fi sudo cp ./scripts/conf/cockpit.conf /etc/cockpit/cockpit.conf diff --git a/scripts/subinstallers/docker.sh b/scripts/subinstallers/docker.sh index b21d452..a051604 100755 --- a/scripts/subinstallers/docker.sh +++ b/scripts/subinstallers/docker.sh @@ -4,11 +4,11 @@ figlet "Mistborn: Installing Docker" sudo apt update -sudo apt install -y python python3-pip python3-setuptools libffi-dev python3-dev libssl-dev +sudo -E apt install -y python python3-pip python3-setuptools libffi-dev python3-dev libssl-dev if [ "$DISTRO" == "ubuntu" ] && [ "$VERSION_ID" == "20.04" ]; then echo "Automated Docker install" - sudo apt-get install -y docker-compose + sudo -E apt-get install -y docker-compose else echo "Manual Docker installation" source ./scripts/subinstallers/docker_manual.sh diff --git a/scripts/subinstallers/docker_manual.sh b/scripts/subinstallers/docker_manual.sh index 9692109..5fca1c9 100755 --- a/scripts/subinstallers/docker_manual.sh +++ b/scripts/subinstallers/docker_manual.sh @@ -2,7 +2,7 @@ # dependencies echo "Installing Docker dependencies" -sudo apt-get install -y \ +sudo -E apt-get install -y \ apt-transport-https \ ca-certificates \ curl \ @@ -42,9 +42,9 @@ echo "Installing docker" sudo apt-get update if [ "$DISTRO" == "ubuntu" ] || [ "$DISTRO" == "debian" ]; then - sudo apt-get install -y docker-ce docker-ce-cli containerd.io + sudo -E apt-get install -y docker-ce docker-ce-cli containerd.io elif [ "$DISTRO" == "raspbian" ]; then - sudo apt install -y --no-install-recommends \ + sudo -E apt install -y --no-install-recommends \ docker-ce \ cgroupfs-mount fi @@ -59,7 +59,7 @@ echo "Installing Docker Compose" # sudo chmod +x /usr/local/bin/docker-compose #elif [ "$DISTRO" == "raspbian" ]; then # Install required packages -sudo apt install -y python-backports.ssl-match-hostname +sudo -E apt install -y python-backports.ssl-match-hostname # Install Docker Compose from pip # This might take a while diff --git a/scripts/subinstallers/iptables.sh b/scripts/subinstallers/iptables.sh index 3715306..7c59891 100755 --- a/scripts/subinstallers/iptables.sh +++ b/scripts/subinstallers/iptables.sh @@ -102,7 +102,7 @@ if [ ! "$(dpkg-query -l iptables-persistent)" ]; then echo iptables-persistent iptables-persistent/autosave_v6 boolean true | sudo debconf-set-selections # install - sudo apt-get install -y iptables-persistent ipset + sudo -E apt-get install -y iptables-persistent ipset else echo "Saving iptables rules" sudo bash -c "iptables-save > /etc/iptables/rules.v4" diff --git a/scripts/subinstallers/openssl.sh b/scripts/subinstallers/openssl.sh index e010fad..c5d58eb 100755 --- a/scripts/subinstallers/openssl.sh +++ b/scripts/subinstallers/openssl.sh @@ -8,7 +8,7 @@ CRT_PATH="$KEY_FOLDER/$CRT_FILE" KEY_PATH="$KEY_FOLDER/$KEY_FILE" # ensure openssl installed -sudo apt-get install -y openssl +sudo -E apt-get install -y openssl # make folder mkdir -p $KEY_FOLDER diff --git a/scripts/subinstallers/wireguard.sh b/scripts/subinstallers/wireguard.sh index 93b2490..a544591 100755 --- a/scripts/subinstallers/wireguard.sh +++ b/scripts/subinstallers/wireguard.sh @@ -11,7 +11,7 @@ if ! $(sudo apt-cache show wireguard > /dev/null 2>&1) ; then # Wireguard if [ "$DISTRO" == "raspbian" ]; then echo "Adding Wireguard repo keys" - sudo apt-get install -y dirmngr + sudo -E apt-get install -y dirmngr sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 8B48AD6246925553 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 7638D0442B90D010 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 04EE7237B7D453EC @@ -29,4 +29,4 @@ fi echo "Installing Wireguard" sudo apt-get update -sudo apt-get install -y openresolv wireguard +sudo -E apt-get install -y openresolv wireguard