From d840235a9075471ee10d14e2e6b7a5c6c687995d Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 10 Feb 2024 21:56:05 +0100 Subject: [PATCH 1/5] Fixed Install Script --- install.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/install.sh b/install.sh index 471adb5..334b833 100644 --- a/install.sh +++ b/install.sh @@ -26,9 +26,11 @@ installTheme(){ mv resources/scripts/components/server/console/Console.tsx /var/www/pterodactyl/resources/scripts/components/server/console/Console.tsx cd /var/www/pterodactyl - curl -sL https://deb.nodesource.com/setup_16.x | sudo -E bash - + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash + export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" + [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" apt update - apt install -y nodejs + nmv install node npm i -g yarn yarn From b3f97a60d7238f441525c96b62596002f833ad6c Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 10 Feb 2024 21:56:30 +0100 Subject: [PATCH 2/5] Changed Readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a5253ae..e8f5d14 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# IceMinecraftTheme +# IceMinecraftTheme (Updated Version) Install script: ```sh -bash <(curl https://raw.githubusercontent.com/Angelillo15/IceMinecraftTheme/main/install.sh) +bash <(curl https://raw.githubusercontent.com/Reddishye/IceMinecraftTheme/main/install.sh) ``` \ No newline at end of file From 3ec7b4969ee3dcadc0f540b63daf2c786d580e65 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 10 Feb 2024 22:37:50 +0100 Subject: [PATCH 3/5] Fixed Install --- README.md | 4 ++-- install.sh | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index e8f5d14..a5253ae 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# IceMinecraftTheme (Updated Version) +# IceMinecraftTheme Install script: ```sh -bash <(curl https://raw.githubusercontent.com/Reddishye/IceMinecraftTheme/main/install.sh) +bash <(curl https://raw.githubusercontent.com/Angelillo15/IceMinecraftTheme/main/install.sh) ``` \ No newline at end of file diff --git a/install.sh b/install.sh index 334b833..c974e6a 100644 --- a/install.sh +++ b/install.sh @@ -26,11 +26,13 @@ installTheme(){ mv resources/scripts/components/server/console/Console.tsx /var/www/pterodactyl/resources/scripts/components/server/console/Console.tsx cd /var/www/pterodactyl - curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | bash + curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | sudo -E bash - export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" apt update nmv install node + apt update + apt install -y nodejs npm i -g yarn yarn From 1b2660b4f0ccbce9c889e5d0c7c885783fabbc50 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Sat, 10 Feb 2024 22:44:02 +0100 Subject: [PATCH 4/5] Fixed InstallTheme --- install.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/install.sh b/install.sh index c974e6a..05a432b 100644 --- a/install.sh +++ b/install.sh @@ -27,21 +27,26 @@ installTheme(){ cd /var/www/pterodactyl curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh | sudo -E bash - - export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")" + export NVM_DIR="$HOME/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" - apt update - nmv install node + [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" + nvm install node || { + echo "nvm command not found, trying to source nvm script directly..." + . ~/.nvm/nvm.sh + nvm install node + } apt update apt install -y nodejs npm i -g yarn yarn export NODE_OPTIONS=--openssl-legacy-provider - cd /var/www/pterodactyl - yarn build:production + yarn build:production || { + echo "node: --openssl-legacy-provider is not allowed in NODE_OPTIONS" + export NODE_OPTIONS= + yarn build:production + } sudo php artisan optimize:clear - - } installThemeQuestion(){ From 2bf5f0ccb106b49ee38ba6e9c253c56b01bc37b1 Mon Sep 17 00:00:00 2001 From: Hugo Torres <46359630+Reddishye@users.noreply.github.com> Date: Sat, 10 Feb 2024 22:58:26 +0100 Subject: [PATCH 5/5] Update install.sh Co-authored-by: Angelillo15 --- install.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/install.sh b/install.sh index 05a432b..10f961e 100644 --- a/install.sh +++ b/install.sh @@ -36,7 +36,6 @@ installTheme(){ nvm install node } apt update - apt install -y nodejs npm i -g yarn yarn