From 8d31425e30528cf1d50373549c1a572be3b8254c Mon Sep 17 00:00:00 2001 From: Alvarito050506 Date: Tue, 17 Aug 2021 10:38:16 -0300 Subject: [PATCH] Updated MCPI (un)install scripts. I hope this fixes an obscure installation error we were getting. --- apps/Minecraft Pi (Modded)/install | 11 ++++++----- apps/Minecraft Pi (Modded)/uninstall | 6 +++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/apps/Minecraft Pi (Modded)/install b/apps/Minecraft Pi (Modded)/install index f0ccfcb..39e249b 100755 --- a/apps/Minecraft Pi (Modded)/install +++ b/apps/Minecraft Pi (Modded)/install @@ -30,9 +30,9 @@ done [[ $i -gt 0 ]] && printf "Done.\n" # Remove old MCPILs -sudo apt-get remove -y mcpil-r mcpil || true +sudo apt-get remove -y mcpil-r mcpil &>/dev/null || true -wget -qO- https://raw.githubusercontent.com/MCPI-Revival/mcpi-packages/master/install.sh | sudo bash - || error "Failed to install APT repo!" +wget -q -O - https://raw.githubusercontent.com/MCPI-Revival/mcpi-packages/master/install.sh | sudo bash - || error "Failed to install APT repo!" # Choose MCPIL to use PS3="Which launcher for MCPI Modded would you like to use? Need help deciding? Ask here: https://discord.com/invite/aDqejQGMMy @@ -42,15 +42,16 @@ select opt in "${options[@]}" do case $opt in "${options[0]}") - "${DIRECTORY}/pkg-install" "minecraft-pi-reborn-client gmcpil python3 python3-pip" "$(dirname "$0")" || exit 1 + MCPIL="gmcpil" break;; "${options[1]}") - "${DIRECTORY}/pkg-install" "minecraft-pi-reborn-client jmcpil python3 python3-pip" "$(dirname "$0")" || exit 1 + MCPIL="jmcpil" break;; "${options[2]}") - break;; + exit 0 *) echo "Invalid option: $REPLY";; esac done +"${DIRECTORY}/pkg-install" "${MCPIL} python3-pip" "$(dirname "$0")" pip3 install mcpi diff --git a/apps/Minecraft Pi (Modded)/uninstall b/apps/Minecraft Pi (Modded)/uninstall index 358ee8b..8b5e19c 100755 --- a/apps/Minecraft Pi (Modded)/uninstall +++ b/apps/Minecraft Pi (Modded)/uninstall @@ -23,9 +23,9 @@ do done [[ $i -gt 0 ]] && printf "Done.\n" -sudo apt-get remove -y minecraft-pi-reborn-native &>/dev/null || true +sudo apt remove -y minecraft-pi-reborn-native &>/dev/null || true "${DIRECTORY}/purge-installed" "$(dirname "$0")" || exit 1 -sudo apt-get -y autoremove +sudo apt -y autoremove -sudo rm -f /etc/apt/sources.list.d/mcpi-revival.list +sudo rm -f /etc/apt/{sources.list,trusted.gpg}.d/mcpi-revival.{list,gpg}