From efc73f7262524cafef17f56a36674d81dc7267ed Mon Sep 17 00:00:00 2001 From: zontreck Date: Sat, 31 Aug 2024 01:56:20 -0700 Subject: [PATCH] Update install script to be able to run automated as root --- installscript.sh | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/installscript.sh b/installscript.sh index 55bbeb2..0784a95 100644 --- a/installscript.sh +++ b/installscript.sh @@ -1,28 +1,48 @@ #!/bin/bash echo "Starting up Aria's Creations tools installer" -PASS=$(zenity --password --title="SHT Installer" --timeout=120) -echo -ne $PASS | sudo -S echo "Escalation successful" +# Check if the script is running as root +if [ "$(id -u)" -eq 0 ]; then + echo "Running as root. No need for sudo or password." + SUDO_CMD="" +else + echo "Not running as root. Sudo and password required." + PASS=$(zenity --password --title="SHT Installer" --timeout=120) + + # Check if the password input was canceled or failed + if [ -z "$PASS" ]; then + echo "No password entered. Exiting installer." + exit 1 + fi + + # Test password to check if it's correct + echo -ne "$PASS" | sudo -S echo "Escalation successful" &>/dev/null + if [ $? -ne 0 ]; then + echo "Password incorrect. Exiting installer." + exit 1 + fi + + SUDO_CMD="echo -ne $PASS | sudo -S" +fi # Download the tools and put them in place -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/nbt2snbt-linux-x64 -O /usr/bin/nbt2snbt +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/nbt2snbt-linux-x64 -O /usr/bin/nbt2snbt -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/pause-linux-x64 -O /usr/bin/pause +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/pause-linux-x64 -O /usr/bin/pause -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/snbt2nbt-linux-x64 -O /usr/bin/snbt2nbt +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/snbt2nbt-linux-x64 -O /usr/bin/snbt2nbt -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/dbikc-linux-x64 -O /usr/bin/dbikc +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/dbikc-linux-x64 -O /usr/bin/dbikc -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/uuidgen-linux-x64 -O /usr/bin/uuidgen +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/uuidgen-linux-x64 -O /usr/bin/uuidgen -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/sleep-linux-x64 -O /usr/bin/vsleep +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/sleep-linux-x64 -O /usr/bin/vsleep -echo -ne $PASS | sudo -S wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/mkfsreport-linux-x64 -O /usr/bin/mkfsreport +$SUDO_CMD wget https://ci.zontreck.com/job/Projects/job/Dart/job/SimpleHelperTools/job/main/lastSuccessfulBuild/artifact/dart/out/mkfsreport-linux-x64 -O /usr/bin/mkfsreport - - -echo -ne $PASS | sudo -S chmod +x /usr/bin/{nbt2snbt,snbt2nbt,pause,mkfsreport,dbikc,vsleep} +# Set executable permissions +$SUDO_CMD chmod +x /usr/bin/{nbt2snbt,snbt2nbt,pause,mkfsreport,dbikc,vsleep} echo "Installation Completed" -vsleep 5 \ No newline at end of file +vsleep 5