Skip to content

Commit

Permalink
v1.0.5
Browse files Browse the repository at this point in the history
  fixing install curl loop
  • Loading branch information
zudsniper committed Dec 15, 2022
1 parent 8ba939b commit 3b6a119
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 7 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

---

Expand Down
16 changes: 10 additions & 6 deletions installDeb10Pt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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" != "" ]
Expand All @@ -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
Expand All @@ -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}";
Expand Down

0 comments on commit 3b6a119

Please sign in to comment.