Skip to content

Commit 315cb1b

Browse files
committed
silence some kill commands (closes #929)
- also add comments and remove mention of 10.3.3 32-bit for #928
1 parent c68df9a commit 315cb1b

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

restore.sh

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ clean() {
6363
clean_sudo() {
6464
clean
6565
sudo rm -rf /tmp/futurerestore /tmp/*.json "$(dirname "$0")/tmp$$/"* "$(dirname "$0")/iP"*/ "$(dirname "$0")/tmp$$/"
66-
sudo kill $sudoloop_pid
66+
sudo kill $sudoloop_pid 2>/dev/null
6767
}
6868

6969
clean_usbmuxd() {
@@ -548,7 +548,7 @@ set_tool_paths() {
548548
ssh2="/usr/bin/ssh"
549549

550550
# kill macos daemons
551-
killall -STOP AMPDevicesAgent AMPDeviceDiscoveryAgent MobileDeviceUpdater
551+
killall -STOP AMPDevicesAgent AMPDeviceDiscoveryAgent MobileDeviceUpdater 2>/dev/null
552552

553553
else
554554
error "Your platform ($OSTYPE) is not supported." "* Supported platforms: Linux, macOS"
@@ -1502,6 +1502,7 @@ device_get_info() {
15021502

15031503
# set device_use_vers, device_use_build (where to get the baseband and manifest from for ota/other)
15041504
# for a7/a8 other restores 11.3+, device_latest_vers and device_latest_build are used
1505+
# these latest versions are not expected to change anymore (maybe except for 18.x)
15051506
case $device_type in
15061507
iPhone1,1 | iPod1,1 )
15071508
device_use_vers="3.1.3"
@@ -1531,7 +1532,7 @@ device_get_info() {
15311532
device_use_vers="9.3.6"
15321533
device_use_build="13G37"
15331534
;;
1534-
iPad3,[456] | iPhone5,[1234] )
1535+
iPad3,[456] | iPhone5,[1234] ) # 10.3.4 works for ALL A6(X) devices
15351536
device_use_vers="10.3.4"
15361537
device_use_build="14G61"
15371538
;;
@@ -4569,6 +4570,7 @@ ipsw_prepare_multipatch() {
45694570
use_ticket=
45704571
fi
45714572

4573+
# for 4.2.1 and lower powdersn0w multipatch
45724574
vers="4.2.1"
45734575
build="8C148"
45744576
if [[ $ipsw_isbeta == 1 ]]; then
@@ -4578,6 +4580,7 @@ ipsw_prepare_multipatch() {
45784580
vers="$device_target_vers"
45794581
build="$device_target_build"
45804582
fi
4583+
# for betas multipatch
45814584
case $device_target_vers in
45824585
4.3* ) vers="4.3.5"; build="8L1";;
45834586
5* ) vers="5.1.1"; build="9B206";;
@@ -4586,6 +4589,7 @@ ipsw_prepare_multipatch() {
45864589
8* ) vers="8.4.1"; build="12H321";;
45874590
9* ) vers="9.3.5"; build="13G36";;
45884591
esac
4592+
# for gasgauge multipatch
45894593
if [[ $ipsw_gasgauge_patch == 1 ]]; then
45904594
vers="6.1.3"
45914595
build="10B329"
@@ -4594,6 +4598,7 @@ ipsw_prepare_multipatch() {
45944598
build="11D257"
45954599
fi
45964600
fi
4601+
45974602
saved_path="../saved/$device_type/$build"
45984603
ipsw_get_url $build
45994604
url="$ipsw_url"
@@ -5644,7 +5649,7 @@ restore_futurerestore() {
56445649
print "* Please read the \"Troubleshooting\" wiki page in GitHub before opening any issue!"
56455650
print "* Your problem may have already been addressed within the wiki page."
56465651
print "* If opening an issue in GitHub, please provide a FULL log/output. Otherwise, your issue may be dismissed."
5647-
kill $httpserver_pid
5652+
kill $httpserver_pid 2>/dev/null
56485653
}
56495654

56505655
restore_latest() {
@@ -9352,7 +9357,7 @@ menu_ipsw_browse() {
93529357
return
93539358
elif [[ $device_target_vers == "10"* && $device_proc == 6 ]]; then
93549359
log "Selected IPSW ($device_target_vers) is not supported as target version."
9355-
print "* iOS 10 versions that are not 10.3.3/10.3.4 are not supported for 32-bit devices."
9360+
print "* iOS 10 versions that are not 10.3.4 are not supported for 32-bit devices."
93569361
pause
93579362
return
93589363
fi

0 commit comments

Comments
 (0)