diff --git a/README.md b/README.md index 6c801e0..787ea93 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ### `Summary` for internal use only of spooky.tf team. Do not reuse without permission. Or do. But I'll be mad. -## `VERSION = 1.0.4` +## `VERSION = 1.0.5` --- diff --git a/installDeb10Pt.sh b/installDeb10Pt.sh index eae35a0..186befd 100644 --- a/installDeb10Pt.sh +++ b/installDeb10Pt.sh @@ -136,7 +136,11 @@ if [ -z ${SKIP_PROMPTS_YES} ] && [ -z ${SKIP_PROMPTS_NO} ] ; then select ctbt in Yes No do if [[ $ctbt -eq "Y" ]]; then - apt install -y certbot curl + PKG_OK=$(dpkg-query -W -f='${Status}' curl 2>/dev/null | grep -c "ok installed") + if [[ $PKG_OK -eq 0 ]]; then + apt install curl; + fi + apt install -y certbot fi if [ "$ctbt" != "" ] @@ -151,10 +155,10 @@ if [ -z ${SKIP_PROMPTS_YES} ] && [ -z ${SKIP_PROMPTS_NO} ] ; then if [[ $compo -eq "Y" ]]; then curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer fi - if [ "$compo" != "" ] - then - break - fi + if [ "$compo" != "" ] + then + break + fi done elif [[ SKIP_PROMPTS_YES -eq "Y" ]]; then apt install -y certbot curl @@ -179,7 +183,7 @@ else fi echo -ne "${A_INVERSE}------------------------------------------------${A_RESET}...\n"; -echo -ne "${A_YELLOW}Adding users${A_RESET}...\n ${A_ITALIC}$this will REQUIRE your root password!${A_RESET}\n"; +echo -ne "${A_YELLOW}Adding users${A_RESET}...\n ${A_ITALIC}this will REQUIRE your root password!${A_RESET}\n"; echo -ne "${A_RED}${A_BOLD}PRETTY SURE THE AUTOMATION IS BROKEN, FINISH MANUALLY! ${A_RESET}\n"; echo -ne "${A_BOLD}https://pterodactyl.io/tutorials/mysql_setup.html${A_RESET}";