More fixes

This commit is contained in:
LukeeGD 2024-09-13 18:05:50 +08:00
parent 984f8edefe
commit 742c9c37b9

View File

@ -398,13 +398,11 @@ install_depends() {
elif [[ $platform == "macos" ]]; then elif [[ $platform == "macos" ]]; then
print "* Legacy iOS Kit will be installing dependencies and setting up permissions of tools" print "* Legacy iOS Kit will be installing dependencies and setting up permissions of tools"
print "* Enter your user password when prompted" xattr -cr ../bin/macos
pause
sudo xattr -cr $dir
chown -R $USER:staff $dir
log "Installing Xcode Command Line Tools" log "Installing Xcode Command Line Tools"
xcode-select --install xcode-select --install
print "* Make sure to install requirements from Homebrew/MacPorts: https://github.com/LukeZGD/Legacy-iOS-Kit/wiki/How-to-Use" print "* Make sure to install requirements from Homebrew/MacPorts: https://github.com/LukeZGD/Legacy-iOS-Kit/wiki/How-to-Use"
pause
fi fi
echo "$platform_ver" > "../resources/firstrun" echo "$platform_ver" > "../resources/firstrun"
@ -428,10 +426,7 @@ install_depends() {
version_update_check() { version_update_check() {
pushd "$(dirname "$0")/tmp$$" >/dev/null pushd "$(dirname "$0")/tmp$$" >/dev/null
if [[ $platform == "macos" && ! -e ../resources/firstrun ]]; then if [[ $platform == "macos" && ! -e ../resources/firstrun ]]; then
print "* Legacy iOS Kit will be installing setting up permissions of tools" xattr -cr ../bin/macos
print "* Enter your user password when prompted"
pause
sudo xattr -cr $dir
fi fi
log "Checking for updates..." log "Checking for updates..."
github_api=$(curl https://api.github.com/repos/LukeZGD/Legacy-iOS-Kit/releases/latest 2>/dev/null) github_api=$(curl https://api.github.com/repos/LukeZGD/Legacy-iOS-Kit/releases/latest 2>/dev/null)
@ -2150,6 +2145,15 @@ ipsw_preference_set() {
echo echo
fi fi
case $device_type in
iPad[23],[23] | "$device_disable_bbupdate" ) ipsw_nskip=1;;
esac
if [[ $device_target_vers == "4.2"* || $device_target_vers == "4.3"* || $ipsw_gasgauge_patch == 1 ]]; then
ipsw_nskip=1
elif [[ $platform == "macos" && $platform_arch == "arm64" ]]; then
ipsw_nskip=1
fi
case $device_type in case $device_type in
iPhone2,1 | iPod2,1 ) ipsw_canmemory=1;; iPhone2,1 | iPod2,1 ) ipsw_canmemory=1;;
iPad[23],[23] ) ipsw_canmemory=1;; iPad[23],[23] ) ipsw_canmemory=1;;
@ -2159,8 +2163,9 @@ ipsw_preference_set() {
esac esac
;; ;;
esac esac
if [[ $device_target_powder == 1 || $device_target_tethered == 1 || if [[ $device_target_powder == 1 || $device_target_tethered == 1 ||
$ipsw_jailbreak == 1 || $ipsw_gasgauge_patch == 1 || $ipsw_jailbreak == 1 || $ipsw_gasgauge_patch == 1 || $ipsw_nskip == 1 ||
$device_type == "$device_disable_bbupdate" ]]; then $device_type == "$device_disable_bbupdate" ]]; then
ipsw_canmemory=1 ipsw_canmemory=1
fi fi
@ -3215,22 +3220,13 @@ ipsw_prepare_32bit() {
local ExtraArgs local ExtraArgs
local daibutsu local daibutsu
local JBFiles=() local JBFiles=()
local nskip if [[ $device_target_vers == "3"* || $device_target_vers == "4"* ]] && [[ $ipsw_nskip != 1 ]]; then
case $device_type in
iPad[23],[23] | "$device_disable_bbupdate" ) nskip=1;;
esac
if [[ $device_target_vers == "4.2"* || $device_target_vers == "4.3"* || $ipsw_gasgauge_patch == 1 ]]; then
nskip=1
elif [[ $platform == "macos" && $platform_arch == "arm64" ]]; then
nskip=1
fi
if [[ $device_target_vers == "3"* || $device_target_vers == "4"* ]] && [[ $nskip != 1 ]]; then
ipsw_prepare_jailbreak ipsw_prepare_jailbreak
return return
elif [[ -e "$ipsw_custom.ipsw" ]]; then elif [[ -e "$ipsw_custom.ipsw" ]]; then
log "Found existing Custom IPSW. Skipping IPSW creation." log "Found existing Custom IPSW. Skipping IPSW creation."
return return
elif [[ $nskip == 1 ]]; then elif [[ $ipsw_nskip == 1 ]]; then
: :
elif [[ $ipsw_jailbreak != 1 && $device_target_build != "9A406" && # 9a406 needs custom ipsw elif [[ $ipsw_jailbreak != 1 && $device_target_build != "9A406" && # 9a406 needs custom ipsw
$device_proc != 4 && $device_actrec != 1 && $device_target_tethered != 1 ]]; then $device_proc != 4 && $device_actrec != 1 && $device_target_tethered != 1 ]]; then
@ -4621,7 +4617,7 @@ restore_futurerestore() {
rm $futurerestore2 rm $futurerestore2
fi fi
if [[ ! -e $futurerestore2 ]]; then if [[ ! -e $futurerestore2 ]]; then
local url="https://nightly.link/futurerestore/futurerestore/actions/runs/9901660300/" local url="https://github.com/LukeZGD/Legacy-iOS-Kit-Keys/releases/download/jailbreak/"
local file="futurerestore-" local file="futurerestore-"
case $platform in case $platform in
"macos" ) file+="macOS-RELEASE.zip";; "macos" ) file+="macOS-RELEASE.zip";;