From 68997fbfae563d178066a1ce01f2a2bbd77e3986 Mon Sep 17 00:00:00 2001 From: LukeZGD Date: Sat, 5 Mar 2022 19:57:23 +0800 Subject: [PATCH] Update some messages the "enter root password" message is not accurate. sudo doesn't ask for root password, it asks for the current user's password --- resources/depends.sh | 2 +- resources/device.sh | 8 ++++---- resources/downgrade.sh | 2 +- restore.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/depends.sh b/resources/depends.sh index 734f343..1f50afb 100755 --- a/resources/depends.sh +++ b/resources/depends.sh @@ -104,7 +104,7 @@ InstallDepends() { Log "Installing dependencies..." if [[ $platform == "linux" ]]; then Echo "* iOS-OTA-Downgrader will be installing dependencies from your distribution's package manager" - Echo "* Enter root password of your PC when prompted" + Echo "* Enter your user password when prompted" Input "Press Enter/Return to continue (or press Ctrl+C to cancel)" read -s fi diff --git a/resources/device.sh b/resources/device.sh index 77ed26a..a7b5045 100755 --- a/resources/device.sh +++ b/resources/device.sh @@ -39,7 +39,7 @@ GetDeviceValues() { ideviceinfo2=$($ideviceinfo -s) if [[ $? != 0 && $1 != "NoDevice" ]]; then Log "Finding device in DFU/recovery mode..." - [[ $platform == "linux" ]] && Echo "* Enter root password of your PC when prompted" + [[ $platform == "linux" ]] && Echo "* Enter your user password when prompted" DeviceState="$($irecovery -q 2>/dev/null | grep -w "MODE" | cut -c 7-)" elif [[ $1 == "NoDevice" ]]; then Log "NoDevice argument detected. Skipping device detection" @@ -68,7 +68,7 @@ GetDeviceValues() { echo -e "\n${Color_R}[Error] No device detected. Please put the device in normal mode before proceeding. ${Color_N}" echo "${Color_Y}* Make sure to also trust this computer by selecting \"Trust\" at the pop-up. ${Color_N}" echo "${Color_Y}* For macOS users, double-check if the device is being detected by iTunes/Finder. ${Color_N}" - echo "${Color_Y}* Recovery or DFU mode is also applicable. For more details regarding alternative methods, read the \"Troubleshooting\" wiki page in GitHub ${Color_N}" + echo "${Color_Y}* Recovery or DFU mode is also applicable. ${Color_N}" echo "${Color_Y}* To perform operations without an iOS device connected, add NoDevice as an argument. ${Color_N}" echo "${Color_Y}* For more details, read the \"Troubleshooting\" wiki page in GitHub ${Color_N}" exit 1 @@ -182,7 +182,7 @@ CheckM8() { Input "Select your option:" select opt in "${Selection[@]}"; do case $opt in - "ipwnder_lite") pwnDFUTool="$ipwnder_lite"; break;; + "ipwnder_lite" ) pwnDFUTool="$ipwnder_lite"; break;; "ipwndfu" ) pwnDFUTool="ipwndfu"; break;; * ) pwnDFUTool="$ipwnder32"; break;; esac @@ -194,7 +194,7 @@ CheckM8() { Log "Entering pwnDFU mode with $pwnDFUTool..." if [[ $pwnDFUTool == "ipwndfu" ]]; then cd resources/ipwndfu - [[ $platform == "linux" ]] && Echo "* Enter root password of your PC when prompted" + [[ $platform == "linux" ]] && Echo "* Enter your user password when prompted" $ipwndfu -p if [[ $DeviceProc == 7 ]]; then Log "Running rmsigchks.py..." diff --git a/resources/downgrade.sh b/resources/downgrade.sh index d2313fc..747956f 100755 --- a/resources/downgrade.sh +++ b/resources/downgrade.sh @@ -146,7 +146,7 @@ Downgrade() { fi Log "Proceeding to futurerestore..." - [[ $platform == "linux" ]] && Echo "* Enter root password of your PC when prompted" + [[ $platform == "linux" ]] && Echo "* Enter your user password when prompted" cd resources $SimpleHTTPServer & ServerPID=$! diff --git a/restore.sh b/restore.sh index b45546a..0c2dcf3 100755 --- a/restore.sh +++ b/restore.sh @@ -241,7 +241,7 @@ SelectVersion() { "iOS 8.4.1" ) OSVer="8.4.1"; BuildVer="12H321"; break;; "iOS 6.1.3" ) OSVer="6.1.3"; BuildVer="10B329"; break;; "Other (use SHSH blobs)" ) OSVer="Other"; break;; - *) exit 0;; + * ) exit 0;; esac done }