diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index bdc34de..6ca3a2c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,7 +40,15 @@ jobs: - name: Move linux binaries and other files run: | - rm -r ./bin/linux/x86_64 ./resources/lib/* + rm -r ./bin/linux/x86_64 + cp -R ./exclude/bin/linux/arm64 ./bin/linux + + - name: Zip linux arm64 files + run: zip -r ${{ github.event.repository.name }}_linux_arm64_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip bin/ LICENSE resources/ restore.sh README.md + + - name: Move linux arm64 binaries and other files + run: | + rm -r ./bin/linux/arm64 ./resources/lib/* cp -R ./exclude/bin/linux/arm ./bin/linux - name: Zip linux arm files @@ -73,5 +81,6 @@ jobs: ${{ github.event.repository.name }}_complete_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip ${{ github.event.repository.name }}_macos_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip ${{ github.event.repository.name }}_linux_arm_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip + ${{ github.event.repository.name }}_linux_arm64_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip ${{ github.event.repository.name }}_linux_x86_64_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip ${{ github.event.repository.name }}_windows_${{ env.DATE }}-${{ env.SHA_SHORT }}.zip diff --git a/bin/linux/arm64/futurerestore_new b/bin/linux/arm64/futurerestore_new new file mode 100755 index 0000000..fd9c22f Binary files /dev/null and b/bin/linux/arm64/futurerestore_new differ diff --git a/bin/linux/arm64/futurerestore_old b/bin/linux/arm64/futurerestore_old new file mode 100755 index 0000000..8b6f8b5 Binary files /dev/null and b/bin/linux/arm64/futurerestore_old differ diff --git a/bin/linux/arm64/hfsplus b/bin/linux/arm64/hfsplus new file mode 100755 index 0000000..567dcc8 Binary files /dev/null and b/bin/linux/arm64/hfsplus differ diff --git a/bin/linux/arm64/ideviceenterrecovery b/bin/linux/arm64/ideviceenterrecovery new file mode 100755 index 0000000..ee3db60 Binary files /dev/null and b/bin/linux/arm64/ideviceenterrecovery differ diff --git a/bin/linux/arm64/ideviceinfo b/bin/linux/arm64/ideviceinfo new file mode 100755 index 0000000..14ca228 Binary files /dev/null and b/bin/linux/arm64/ideviceinfo differ diff --git a/bin/linux/arm64/idevicererestore b/bin/linux/arm64/idevicererestore new file mode 100755 index 0000000..489d6ba Binary files /dev/null and b/bin/linux/arm64/idevicererestore differ diff --git a/bin/linux/arm64/idevicerestore b/bin/linux/arm64/idevicerestore new file mode 100755 index 0000000..c4d62df Binary files /dev/null and b/bin/linux/arm64/idevicerestore differ diff --git a/bin/linux/arm64/iproxy b/bin/linux/arm64/iproxy new file mode 100755 index 0000000..0d6ce9b Binary files /dev/null and b/bin/linux/arm64/iproxy differ diff --git a/bin/linux/arm64/ipsw b/bin/linux/arm64/ipsw new file mode 100755 index 0000000..0a2cca3 Binary files /dev/null and b/bin/linux/arm64/ipsw differ diff --git a/bin/linux/arm64/ipwnder b/bin/linux/arm64/ipwnder new file mode 100755 index 0000000..1b7b220 Binary files /dev/null and b/bin/linux/arm64/ipwnder differ diff --git a/bin/linux/arm64/irecovery b/bin/linux/arm64/irecovery new file mode 100755 index 0000000..8486b1e Binary files /dev/null and b/bin/linux/arm64/irecovery differ diff --git a/bin/linux/arm64/irecovery2 b/bin/linux/arm64/irecovery2 new file mode 100755 index 0000000..cb85c96 Binary files /dev/null and b/bin/linux/arm64/irecovery2 differ diff --git a/bin/linux/arm64/keep b/bin/linux/arm64/keep deleted file mode 100644 index 8d1c8b6..0000000 --- a/bin/linux/arm64/keep +++ /dev/null @@ -1 +0,0 @@ - diff --git a/bin/linux/arm64/partialzip b/bin/linux/arm64/partialzip new file mode 100755 index 0000000..c034199 Binary files /dev/null and b/bin/linux/arm64/partialzip differ diff --git a/bin/linux/arm64/powdersn0w b/bin/linux/arm64/powdersn0w new file mode 100755 index 0000000..8a60fd4 Binary files /dev/null and b/bin/linux/arm64/powdersn0w differ diff --git a/bin/linux/arm64/ticket b/bin/linux/arm64/ticket new file mode 100755 index 0000000..2dcc1fd Binary files /dev/null and b/bin/linux/arm64/ticket differ diff --git a/bin/linux/arm64/tsschecker b/bin/linux/arm64/tsschecker new file mode 100755 index 0000000..10eaaf7 Binary files /dev/null and b/bin/linux/arm64/tsschecker differ diff --git a/bin/linux/arm64/validate b/bin/linux/arm64/validate new file mode 100755 index 0000000..041f48e Binary files /dev/null and b/bin/linux/arm64/validate differ diff --git a/bin/linux/arm64/xpwntool b/bin/linux/arm64/xpwntool new file mode 100755 index 0000000..64ca357 Binary files /dev/null and b/bin/linux/arm64/xpwntool differ diff --git a/restore.sh b/restore.sh index f3836f8..561c4d4 100755 --- a/restore.sh +++ b/restore.sh @@ -29,7 +29,10 @@ clean_and_exit() { input "Press Enter/Return to exit." read -s fi - rm -rf "$(dirname "$0")/tmp/"* "$(dirname "$0")/iP"*/ "$(dirname "$0")/tmp/" /tmp/futurerestore + if [[ $device_sudoloop == 1 ]]; then + rm -rf /tmp/futurerestore /tmp/*.json + fi + rm -rf "$(dirname "$0")/tmp/"* "$(dirname "$0")/iP"*/ "$(dirname "$0")/tmp/" kill $iproxy_pid $httpserver_pid $sudoloop_pid 2>/dev/null sudo -k exit $1 @@ -269,7 +272,7 @@ install_depends() { elif (( ubuntu_ver >= 22 )) || (( debian_ver >= 12 )) || [[ $debian_ver == "sid" ]]; then sudo apt update - sudo apt install -y bsdiff curl jq libimobiledevice6 libirecovery-common openssh-client python3 unzip usbmuxd usbutils xmlstarlet xxd zenity zip + sudo apt install -y bsdiff curl jq libimobiledevice6 libirecovery-common libssl3 openssh-client python3 unzip usbmuxd usbutils xmlstarlet xxd zenity zip sudo systemctl enable --now udev systemd-udevd usbmuxd 2>/dev/null elif [[ $ID == "fedora" || $ID == "nobara" ]] && (( VERSION_ID >= 36 )); then @@ -689,7 +692,7 @@ device_enter_mode() { echo "chmod +x /tmp/kloader*" > kloaders if [[ $device_det == 1 ]]; then - echo "[[ -e /.installed_kok3shiX ]] && /tmp/kloader /tmp/pwnediBSS || \ + echo "[[ -e /.installed_kok3shiX || -e /.installed_p0insettia ]] && /tmp/kloader /tmp/pwnediBSS || \ /tmp/kloader_hgsp /tmp/pwnediBSS" >> kloaders sendfiles+=("../resources/kloader_hgsp") sendfiles+=("../resources/kloader") @@ -1592,7 +1595,7 @@ ipsw_prepare_32bit_keys() { ipsw_prepare_32bit() { device_fw_key_check - if [[ $platform != "windows" && $device_type != "$device_disable_bbupdate" && $debug_mode != 1 ]]; then + if [[ $platform != "windows" && $device_type != "$device_disable_bbupdate" ]]; then log "No need to create custom IPSW for non-jailbroken restores on $platform" return elif [[ -e "$ipsw_custom.ipsw" ]]; then @@ -1965,7 +1968,7 @@ restore_futurerestore() { fi log "Running futurerestore with command: $futurerestore ${ExtraArgs[*]}" - "$futurerestore" "${ExtraArgs[@]}" + $futurerestore "${ExtraArgs[@]}" log "Restoring done! Read the message below if any error has occurred:" print "* Please read the \"Troubleshooting\" wiki page in GitHub before opening any issue!" print "* Your problem may have already been addressed within the wiki page."