diff --git a/scripts/menus/config_menu.sh b/scripts/menus/config_menu.sh index 408a871..d6a1efd 100644 --- a/scripts/menus/config_menu.sh +++ b/scripts/menus/config_menu.sh @@ -159,15 +159,17 @@ uninstall_proxmenu() { return fi + # Show checklist for dependencies DEPS_TO_REMOVE=$(whiptail --title "Remove Dependencies" --checklist \ - "$(translate "Select dependencies to remove:")" 15 60 3 \ + "Select dependencies to remove:" 15 60 3 \ "python3-venv" "Python virtual environment" OFF \ "python3-pip" "Python package installer" OFF \ "jq" "JSON processor" OFF \ 3>&1 1>&2 2>&3) - + echo "Uninstalling ProxMenu..." + # Remove googletrans if virtual environment exists if [ -f "$VENV_PATH/bin/activate" ]; then echo "Removing googletrans..." source "$VENV_PATH/bin/activate" @@ -175,17 +177,25 @@ uninstall_proxmenu() { deactivate fi + # Remove virtual environment if [ -d "$VENV_PATH" ]; then echo "Removing virtual environment..." rm -rf "$VENV_PATH" fi + # Remove selected dependencies if [ -n "$DEPS_TO_REMOVE" ]; then echo "Removing selected dependencies..." + + # Remove quotes and process each package read -r -a DEPS_ARRAY <<< "$(echo "$DEPS_TO_REMOVE" | tr -d '"')" for dep in "${DEPS_ARRAY[@]}"; do echo "Removing $dep..." + + # Mark package as auto-installed apt-mark auto "$dep" >/dev/null 2>&1 + + # Try to remove with apt-get if ! apt-get -y --purge autoremove "$dep" >/dev/null 2>&1; then echo "Failed to remove $dep with apt-get. Trying with dpkg..." if ! dpkg --purge "$dep" >/dev/null 2>&1; then @@ -193,41 +203,52 @@ uninstall_proxmenu() { dpkg --force-all --purge "$dep" >/dev/null 2>&1 fi fi + + # Verify if the package was actually removed if dpkg -l "$dep" 2>/dev/null | grep -q '^ii'; then echo "Warning: Failed to completely remove $dep. You may need to remove it manually." else echo "$dep successfully removed." fi done + + # Run autoremove to clean up any leftover dependencies echo "Cleaning up unnecessary packages..." apt-get autoremove -y --purge >/dev/null 2>&1 fi - + + + # Restore original .bashrc if backup exists if [ -f /root/.bashrc.bak ]; then - echo "Restoring original .bashrc..." + echo "$(translate "Restoring original .bashrc...")" mv /root/.bashrc.bak /root/.bashrc fi + # Restore original MOTD if backup exists if [ -f /etc/motd.bak ]; then - echo "Restoring original MOTD..." + echo "$(translate "Restoring original MOTD...")" mv /etc/motd.bak /etc/motd else + # Remove custom MOTD line if present sed -i '/This system is optimised by: ProxMenux/d' /etc/motd fi + + # Remove ProxMenu files rm -f "/usr/local/bin/menu" rm -rf "$BASE_DIR" echo "ProxMenu has been uninstalled." + if [ -n "$DEPS_TO_REMOVE" ]; then echo "The following dependencies have been removed successfully: $DEPS_TO_REMOVE" fi + echo echo "ProxMenux uninstallation complete. Thank you for using it!" echo exit 0 } - show_proxmenux_logo show_config_menu