diff --git a/install.sh b/install.sh index bb89ed9..6401273 100755 --- a/install.sh +++ b/install.sh @@ -477,22 +477,25 @@ uninstall() { # $SUDO_CMD /sbin/iptables -D DOCKER-USER -F - echo "Would you like to remove docker? (Y/n)"; - read -r ANSWER; - if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then - #$SUDO_CMD apt-get purge -y docker-ce docker-ce-cli containerd.io docker-engine docker docker.io docker-compose-plugin - #$SUDO_CMD rm -rf /var/lib/docker /etc/docker - #$SUDO_CMD rm /etc/apparmor.d/docker - #$SUDO_CMD groupdel docker - #$SUDO_CMD rm -rf /var/run/docker.sock + if [ "$APT" == "1" ]; then + echo "Would you like to remove docker? (Y/n)"; + read -r ANSWER; + if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then + #$SUDO_CMD apt-get purge -y docker-ce docker-ce-cli containerd.io docker-engine docker docker.io docker-compose-plugin + #$SUDO_CMD rm -rf /var/lib/docker /etc/docker + #$SUDO_CMD rm /etc/apparmor.d/docker + #$SUDO_CMD groupdel docker + #$SUDO_CMD rm -rf /var/run/docker.sock - echo "x"; - fi + echo "x"; + fi + fi; echo "x"; } SUDO_CMD=""; +APT=$($SUDO_CMD type apt 2>/dev/null | grep 'apt is' | wc -l); if [ "$1" == "remove" ]; then ACTION="uninstall"; @@ -542,21 +545,23 @@ if [ -n "$WSL_DISTRO_NAME" ]; then fi fi; -echo "Would you like to install/update docker? (y/N)"; -read -r ANSWER; -if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then +if [ "$APT" == "1" ]; then + echo "Would you like to install/update docker? (y/N)"; + read -r ANSWER; + if [ "$ANSWER" == "y" ] || [ "$ANSWER" == "Y" ]; then - if [ -f "/etc/apt/keyrings/docker.gpg" ]; then - rm -f /etc/apt/keyrings/docker.gpg - fi; + if [ -f "/etc/apt/keyrings/docker.gpg" ]; then + rm -f /etc/apt/keyrings/docker.gpg + fi; - #install_docker_deb; - # install docker using apt-get - install_docker_apt + #install_docker_deb; + # install docker using apt-get + install_docker_apt - echo "Wait..." - sleep 5 -fi + echo "Wait..." + sleep 5 + fi +fi; $SUDO_CMD docker pull registry.format.hu/installer-tool $SUDO_CMD docker pull registry.format.hu/setup