Fix #205 and other stuff

- add note for #204
- fix versioning for git on macOS
- display full idevicerestore command before running
This commit is contained in:
LukeZGD 2022-08-20 12:45:07 +08:00
parent cdd1abbefe
commit 094a798de5
4 changed files with 11 additions and 6 deletions

View File

@ -265,12 +265,9 @@ EnterPwnDFU() {
fi
if [[ $ProductType == "iPhone3,1" ]]; then
if [[ $pwnDFUDevice != 0 ]]; then
Error "Failed to enter pwnDFU mode. Please run the script again" \
if [[ $pwnD != 1 ]]; then
Error "Failed to enter pwnDFU mode. Please run the script again. Note that kDFU mode will NOT work!" \
"Exit DFU mode first by holding the TOP and HOME buttons for about 15 seconds."
elif [[ $pwnD != 1 ]]; then
Error "Your device is not in pwnDFU mode, cannot proceed. Note that kDFU mode will NOT work!" \
"Exit DFU mode by holding the TOP and HOME buttons for about 15 seconds."
else
Log "Device in pwnDFU mode detected."
fi

View File

@ -139,6 +139,7 @@ iDeviceRestore() {
cp $SHSH shsh/${UniqueChipID}-${ProductType}-${OSVer}.shsh
Log "Proceeding to idevicerestore..."
[[ $1 == "latest" ]] && ExtraArgs="-e" || ExtraArgs="-e -w"
Log "Running idevicerestore with command: $idevicerestore $ExtraArgs \"$IPSWRestore.ipsw\""
$idevicerestore $ExtraArgs "$IPSWRestore.ipsw"
echo
Log "Restoring done! Read the message below if any error has occurred:"

View File

@ -50,6 +50,9 @@ JailbreakOption() {
elif [[ $OSVer == "8.4.1" ]]; then
Echo "* Based on some reported issues, Jailbreak Option might not work properly for iOS 8.4.1."
Echo "* I recommend to disable the option for these devices and sideload EtasonJB, HomeDepot, or daibutsu manually."
elif [[ $OSVer == "5.1" ]]; then
Echo "* Based on some reported issues, Jailbreak Option might not work properly for iOS 5.1."
Echo "* I recommend to use other versions instead, such as 5.1.1."
fi
Echo "* This option is enabled by default (Y)."
read -p "$(Input 'Enable this option? (Y/n):')" Jailbreak

View File

@ -81,7 +81,11 @@ Main() {
fi
if [[ -d .git ]]; then
Echo "Version: $(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d)-$(git rev-parse HEAD | cut -c -7)"
if [[ $platform == "macos" ]]; then
Echo "Version: $(date -r $(git log -1 --format="%at") +%Y-%m-%d)-$(git rev-parse HEAD | cut -c -7)"
else
Echo "Version: $(date -d @$(git log -1 --format="%at") --rfc-3339=date)-$(git rev-parse HEAD | cut -c -7)"
fi
elif [[ -e resources/git_hash ]]; then
Echo "Version: $(cat resources/git_hash)"
else