more updates to helper script

assets/files/bluebomb-helper.sh

@@ -1,24 +1,34 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-version="v0.0.3"
+version="0.1.0"
 helpmsg="Need further help? You can either join the Wii Mini Hacking Discord server (recommended) at https://discord.gg/6ryxnkS, the RiiConnect24 Discord server at https://discord.gg/b4Y7jfD or you can send an e-mail to support@riiconnect24.net and we'll try to assist. "
 
-# clear and greet
+# set variable $sudo if the user is not root, so sudo is only used if absolutely needed
-printf "Hello $USER, and welcome to the BlueBomb helper script.\n\nThis script will automatically check you have an environment capable of utilizing BlueBomb, download required files, and automate things as much as possible to make it easier for you, the end user, to perform the BlueBomb exploit on your Wii or Wii Mini console.\n\n" | fold -s -w $(tput cols)
-
-#set variable $sudo if the user is not root, so sudo is only used if absolutely needed
 [[ $USER != "root" ]] && sudo0="sudo"
 
+sc() {
+    clear
+    unset answer
+    printf "\033[1mBlueBomb Helper\033[0m v$version\n\tStage: $1 - $2\n" | fold -s -w $(tput cols)
+    printf -- "=%.0s" $(seq $(tput cols)) && printf "\n\n"
+}
+
+# clear and greet
+sc 0 "Welcome"
+printf "Hello $USER, and welcome to the BlueBomb helper script.\n\nThis script will automatically check you have an environment capable of utilizing BlueBomb, download required files, and automate things as much as possible to make it easier for you, the end user, to perform the BlueBomb exploit on your Wii or Wii Mini console.\n\n" | fold -s -w $(tput cols)
+
 # error handling
 error() {
-    clear
+    sc 0 "Error"
-    printf "An error has occurred.\n\n* Task: $task\n* Command: $BASH_COMMAND\n* Line: $1\n* Exit code: $2\n\n" | fold -s -w $(tput cols)
+    printf "\033[1;91mAn error has occurred.\033[0m\n\nERROR DETAILS:\n\t* Task: $task\n\t* Command: $BASH_COMMAND\n\t* Line: $1\n\t* Exit code: $2\n\n" | fold -s -w $(tput cols)
 
-    case "$task" in
+    case $task in
         "Checking prerequisites - Internet connection" | "Download and extract BlueBomb" ) printf "* NOTE:\n\t* Please ensure that your PC has an active internet connection capable of reaching github.com.\n\n" | fold -s -w $(tput cols) ;;
         "Execute BlueBomb" ) printf "* TROUBLESHOOTING NOTES:\n\t* If you get an error about the address/socket being already in use, try manually disabling the Bluetooth service on your PC. For systemd users, you would run 'sudo systemctl disable --now bluetooth.service', and for OpenRC users, you would run 'sudo rc-service bluetooth stop'.\n\t* If you get an error about the device failing to be powered on, try running the script as root.\n\n" | fold -s -w $(tput cols) ;;
     esac
 
+    [[ -n $output ]] && printf "COMMAND OUTPUT:\n\t${output}\n\n" || true
+
     printf "$helpmsg\n" | fold -s -w $(tput cols)
     exit
 }
@@ -29,7 +39,8 @@ set -o errtrace
 
 credit() {
     #clear
-    printf "Credits:\n
+    sc 0 "Credits"
+    printf "CREDITS:\n
     * Fullmetal5\t\t\tBlueBomb exploit
     * urmum_69\t\t\t\tScript author
     * twosecslater\t\t\tScript author
@@ -84,21 +95,21 @@ printf "* Detected architecture: $arch\n\n"
 dependencies=("unzip" "bluetoothctl" "wget")
 
 printf "Checking dependencies...\n"
-[[ -n "$(command -v pacman)" ]] && pm="pacman -S"
+[[ -x "$(command -v pacman)" ]] && pm="pacman -S" # Arch, etc.
-[[ -n "$(command -v apt)" ]] && pm="apt install"
+[[ -x "$(command -v apt)" ]] && pm="apt install" # Debian, etc.
-[[ -n "$(command -v emerge)" ]] && pm="emerge -aqv"
+[[ -x "$(command -v brew)" ]] && pm="brew install" # literally who uses brew on anything but macos, but doesn't hurt to include support anywho
-[[ -n "$(command -v brew)" ]] && pm="brew install"
+[[ -x "$(command -v apk)" ]] && pm="apk add" # Alpine, etc.
-[[ -n "$(command -v zypper)" ]] && pm="zypper install"
+[[ -x "$(command -v xbps-install)" ]] && pm="xbps-install -S" # Void, etc.
-[[ -n "$(command -v dnf)" ]] && pm="dnf install"
+[[ -x "$(command -v emerge)" ]] && pm="emerge -aqv" # Gentoo, etc.
+[[ -x "$(command -v zypper)" ]] && pm="zypper install" # openSUSE, etc.
+[[ -x "$(command -v dnf)" ]] && pm="dnf install" # Fedora, etc.
 
 for i in "${dependencies[@]}"; do
     [[ -z "$(command -v $i)" ]] && missing+="$i"
 done
 for i in "${missing[@]}"; do
-    [[ -n $pm ]] && printf "\n* $i is missing! Attempting to install using detected package manager (you may be prompted for your password)...\n" | fold -s -w $(tput cols) && $sudo0 $pm $(indep $i) || ex "\n* $i is missing! Please install it using your preferred package manager.\n\n$helpmsg\n"
+    [[ -n $pm ]] && printf "\n* $i is missing! Attempting to install using detected package manager (you may be prompted for your password)...\n" | fold -s -w $(tput cols) && $sudo0 $pm $i || ex "\n* $i is missing! Please install it using your preferred package manager.\n\n$helpmsg\n"
-done
+done; unset i
-unset i
-
 
 ## detect init system
 if [[ -e "$(command -v systemctl)" ]]; then
@@ -112,6 +123,7 @@ fi
 printf "* Detected init system: $init\n\n"
 
 download() {
+    sc 1 "Prerequisites"
     [[ -e ./bluebomb/bluebomb-$arch ]] && printf "BlueBomb executable exists. Not downloading.\n" && cd bluebomb && return
     task="Checking Prerequisites - Internet connection"
     printf "* Checking internet connection... "
@@ -128,32 +140,32 @@ download() {
 }
 
 findinfos() {
-    clear
+    sc 2 "Collecting information - Console type"
     task="Get console information from user"
     if [[ -z $consoleIn ]]; then
-        printf "What is the console type?\n\nOPTIONS:\n\t[1]: Wii\n\t[2]: Wii Mini\n\nPlease type your selection and then press ENTER: " | fold -s -w $(tput cols)
+        printf "What is the console type?\n"
-        read -r consoleIn
+        ask 0 "Wii" "Wii mini"
-    fi
+    else answer=$consoleIn; unset consoleIn; fi
-    case "$consoleIn" in
+    case ${answer^^} in
-        "1" | "Wii" ) arg1="WII_SM" ;;
+        1 | "WII" ) arg1="WII_SM" ;;
-        "2" | "Wii Mini" ) arg1="MINI_SM_" ;;
+        2 | "WII MINI" ) arg1="MINI_SM_" ;;
-        * ) printf "Invalid selection.\n"; unset consoleIn findinfos ;;
+        * ) printf "Invalid selection.\n"; sleep 2; findinfos ;;
     esac
     if [[ $arg1 == "MINI_SM_" ]]; then
         if [[ -z $regionIn ]]; then
-            clear
+            sc 2 "Collecting information - Console region"
-            printf "What is the region of your Wii Mini console?\n\nOPTIONS:\n\t[1]: USA\n\t[2]: PAL\n\nPlease type your selection and then press ENTER: " | fold -s -w $(tput cols)
+            printf "What is the region of your Wii Mini console?\n"
-            read -r regionIn
+            ask 0 "USA" "PAL"
-        fi
+        else answer=$regionIn; unset regionIn; fi
-        case "$regionIn" in
+        case ${answer^^} in
-            "1" | "NTSC" ) arg2="NTSC" ;;
+            1 | "NTSC" ) arg2="NTSC" ;;
-            "2" | "PAL" ) arg2="PAL" ;;
+            2 | "PAL" ) arg2="PAL" ;;
-            * ) printf "Invalid selection.\n"; unset regionIn; findinfos ;;
+            * ) printf "Invalid selection.\n"; sleep 2; findinfos ;;
         esac
     else
         if [[ -z $sysmenuIn ]]; then
-            clear
+            sc 2 "Collecting information - Sysmenu version"
-            printf "What is the system menu version of your Wii Console?\n\nIf you're not sure where to find this, follow the following instructions:\n\nFrom the Wii Menu, launch Wii Options (round button in the bottom left), and then launch Wii Settings. On the first page of the Wii Settings at the upper right corner, you should see 'Ver X.YZ'. Where 'X' and 'Y' are numbers, and 'Z' is a letter. An example is '4.3E'. This is your system menu version.\n\nPlease enter the system menu version and then press ENTER: "
+            printf "What is the system menu version of your Wii Console?\n\nIf you're not sure where to find this, follow the following instructions:\n\nFrom the Wii Menu, launch Wii Options (round button in the bottom left), and then launch Wii Settings. On the first page of the Wii Settings at the upper right corner, you should see 'Ver X.YZ'. Where 'X' and 'Y' are numbers, and 'Z' is a letter. An example is '4.3E'. This is your system menu version.\n\nPlease enter the system menu version and then press ENTER: " | fold -s -w $(tput cols)
             read -r sysmenuIn
         fi
         if [[ ! ${#sysmenuIn} == 4 ]]; then printf "Invalid selection.\n" && unset sysmenuIn && findinfos;
@@ -167,26 +179,26 @@ findinfos() {
 }
 
 confirm() {
-    clear
+    sc 3 "Confirmation"
-    printf "Alrighty, so here's what's about to go down:\n\n* Target console type: "
+    printf "Alrighty, so here's what's about to go down:\n\n* Target console type:\t\t\t\033[1;96m"
     case "$arg1" in
-        "WII_SM" ) printf "Wii\n" ;;
+        "WII_SM" ) printf "Wii\033[0m\n" ;;
-        "MINI_SM_" ) printf "Wii Mini\n" ;;
+        "MINI_SM_" ) printf "Wii mini\033[0m\n" ;;
     esac
-    [[ "$arg1" == "WII_SM" ]] && printf "* Target console system menu version: ${arg2//_/.}\n" || printf "* Target console region: $arg2\n"
+    [[ "$arg1" == "WII_SM" ]] && printf "* Target console sysmenu version:\t\033[1;96m${arg2//_/.}\033[0m\n" || printf "* Target console region:\t\t\033[1;96m$arg2\033[0m\n"
-    printf "\nBlueBomb will be executed with the above, user-provided information.\n\nIs this alright? [y/n]: "
+    printf "\nBlueBomb will be executed with the above, user-provided information.\n"
-    read -r confirmation
+    ask 1 "Do you wish to proceed?"
-    case "${confirmation^^}" in
+    case $response in
-        "Y" | "YES" ) execute ;;
+        0 ) execute ;;
-        * ) unset sysmenuIn; unset consoleIn; unset regionIn; unset arg1; unset arg2; findinfos ;;
+        1 ) unset sysmenuIn; unset consoleIn; unset regionIn; unset arg1; unset arg2; findinfos ;;
     esac
 }
 
 execute() {
-    clear
+    sc 4 "Execute BlueBomb"
-    task="Stop Bluetooth Service"
+    task="Stop Bluetooth service for $init"
     printf "* Stopping the Bluetooth service... (you may be prompted for your password)\n"
-    case "$init" in
+    case $init in
         "systemd" ) $sudo0 systemctl disable --now bluetooth.service ;;
         "openrc" ) $sudo0 rc-service bluetooth stop ;;
     esac
@@ -194,16 +206,39 @@ execute() {
     printf "\n* Executing BlueBomb...\n"
     printf "$sudo0 ./bluebomb-$arch ./stage0/$arg1$arg2.bin stage1.bin\n"
     $sudo0 ./bluebomb-$arch ./stage0/$arg1$arg2.bin stage1.bin
-    printf "* Do you with to re-enable the Bluetooth service...\n * If BlueBomb failed to run, say no, and run the script again. Be persistent, it may take multiple tries\n[y/n]\n"
+    printf "\n\nIf BlueBomb failed to run, say \033[1mno\033[0m to the following question, and run the script again. Be persistent, it may take multiple attempts to get working.\n\n" | fold -s -w $(tput cols)
-    read -r confirmation
+    ask 1 "Do you wish to re-enable the Bluetooth service?"
-    if [[ "${confirmation^^}" == "Y" ]] || [[ "${confirmation^^}" == "YES" ]]; then
+    case $response in
-        case "$init" in
+        0 ) task="Enable Bluetooth service for $init"
+            case $init in
                 "systemd" ) $sudo0 systemctl enable --now bluetooth.service ;;
                 "openrc" ) $sudo0 rc-service bluetooth start ;;
+            esac ;;
     esac
-    fi
+    printf "\n\nExiting in 3 seconds..."; sleep 3
     credit
 }
 
+ask() {
+    case $1 in
+        0 ) unset answer; shift; printf "\nOPTIONS:\n"; for o in "$@"; do
+                ((i++)) || true
+                printf "\t[\033[1m$i\033[0m]: \033[1m$o\033[0m\n" | fold -s -w $(tput cols)
+            done; unset i; unset o
+            printf "\nPlease type your selection and then press ENTER: " | fold -s -w $(tput cols)
+            read -r answer
+            ;;
+        1 ) unset response; shift; printf "\n\033[1m$1\033[0m [\033[1;32myes\033[0m/\033[1;31mno\033[0m]: "
+            read -r answer
+            case ${answer^^} in
+                "Y" | "YES" ) response=0; return ;;
+                "N" | "NO" ) response=1; return ;;
+                * ) printf "Invalid answer \"$answer\". Treating as no.\n"; sleep 2; response=1; return ;; # I'm lazy.
+            esac
+            ;;
+    esac
+}
+
+
 download
 findinfos