Some updates and fix scp/sftp on sshrd 64-bit

fixes #438
This commit is contained in:
LukeZGD 2024-03-19 10:43:17 +08:00
parent 63317b3249
commit f4c1ed3400

View File

@ -3365,13 +3365,14 @@ ipsw_prepare_powder() {
if [[ $device_target_vers == "9"* ]]; then if [[ $device_target_vers == "9"* ]]; then
ExtraArr[0]+="9" ExtraArr[0]+="9"
fi fi
if [[ $ipsw_jailbreak == 1 && $ipsw_verbose == 1 && $device_target_vers != "7"* ]]; then local bootargs
ExtraArr+=("-b" "-v cs_enforcement_disable=1 amfi_get_out_of_my_way=1 amfi=0xff") if [[ $ipsw_jailbreak == 1 && $device_target_vers != "7"* ]]; then
elif [[ $ipsw_jailbreak == 1 && $device_target_vers != "7"* ]]; then bootargs+="cs_enforcement_disable=1 amfi_get_out_of_my_way=1 amfi=0xff"
ExtraArr+=("-b" "cs_enforcement_disable=1 amfi_get_out_of_my_way=1 amfi=0xff")
elif [[ $ipsw_verbose == 1 ]]; then
ExtraArr+=("-b" "-v")
fi fi
if [[ $ipsw_verbose == 1 ]]; then
bootargs+=" -v"
fi
ExtraArr+=("-b" "$bootargs")
patch_iboot "${ExtraArr[@]}" patch_iboot "${ExtraArr[@]}"
tar -cvf iBoot.tar iBoot tar -cvf iBoot.tar iBoot
ExtraArgs+=" iBoot.tar" ExtraArgs+=" iBoot.tar"
@ -3452,7 +3453,7 @@ ipsw_prepare_custom() {
if [[ $device_target_vers == "4"* ]]; then if [[ $device_target_vers == "4"* ]]; then
ipsw_prepare_patchcomp WTF2 # just to make sure ipsw_prepare_patchcomp WTF2 # just to make sure
fi fi
else else # 3GS
case $device_target_vers in case $device_target_vers in
6.1.6 | 4.1 ) :;; 6.1.6 | 4.1 ) :;;
* ) ipsw_prepare_patchcomp LLB;; * ) ipsw_prepare_patchcomp LLB;;
@ -3465,8 +3466,6 @@ ipsw_extract() {
local ipsw="$ipsw_path" local ipsw="$ipsw_path"
if [[ $1 == "custom" ]]; then if [[ $1 == "custom" ]]; then
ipsw="$ipsw_custom" ipsw="$ipsw_custom"
elif [[ $1 == "no_rootfs" ]]; then
ExtraArgs="-x $2"
fi fi
if [[ ! -d "$ipsw" ]]; then if [[ ! -d "$ipsw" ]]; then
mkdir "$ipsw" mkdir "$ipsw"
@ -4049,7 +4048,7 @@ device_send_rdtar() {
} }
device_ramdisk64() { device_ramdisk64() {
local sshtar="../saved/ssh-64.tar" local sshtar="../saved/ssh64.tar"
local comps=("iBSS" "iBEC" "DeviceTree" "Kernelcache" "RestoreRamdisk") local comps=("iBSS" "iBEC" "DeviceTree" "Kernelcache" "RestoreRamdisk")
local name local name
local iv local iv
@ -4096,7 +4095,7 @@ device_ramdisk64() {
comps+=("Trustcache") comps+=("Trustcache")
if [[ ! -e $sshtar ]]; then if [[ ! -e $sshtar ]]; then
log "Downloading ssh.tar from SSHRD_Script..." log "Downloading ssh.tar from SSHRD_Script..."
curl -LO https://github.com/verygenericname/sshtars/raw/a6a93db54cc30a72f577744e50fb66ae57b24990/ssh.tar.gz curl -LO https://github.com/LukeZGD/sshtars/raw/cbaf9f826ca994452beb9e99a3a4ffb496f918fb/ssh.tar.gz
mv ssh.tar.gz $sshtar.gz mv ssh.tar.gz $sshtar.gz
gzip -d $sshtar.gz gzip -d $sshtar.gz
fi fi