Skip to content

Commit bfb6ceb

Browse files
committed
Better handling of newly downloaded copies of script
1 parent ed7354b commit bfb6ceb

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

restore.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -478,11 +478,11 @@ set_tool_paths() {
478478
irecovery3="$sudo "
479479
primepwn="$sudo "
480480
fi
481-
if [[ $(command -v gio) ]]; then
481+
if [[ $(command -v gio) && ! -e ../resources/new ]]; then
482482
log "gio detected. Unmounting all iOS devices with it"
483483
gio mount -l | awk '/gphoto2:\/\/Apple_Inc|afc:\/\// {print $NF}' | while read -r m; do gio mount -u "$m"; done
484484
fi
485-
if [[ $device_argmode != "none" && $device_disable_usbmuxd != 1 ]]; then
485+
if [[ $device_argmode != "none" && $device_disable_usbmuxd != 1 ]] && [[ ! -e ../resources/new ]]; then
486486
trap "clean_usbmuxd" EXIT
487487
if [[ $othertmp == 0 ]]; then
488488
if [[ $live_session != 1 && $device_disable_sudoloop == 1 ]]; then
@@ -639,6 +639,8 @@ install_depends() {
639639
if [[ $platform == "linux" ]]; then
640640
print "* Legacy iOS Kit will be installing dependencies from your distribution's package manager"
641641
print "* Enter your user password when prompted"
642+
print "* Your password input will not be visible, but it is still being entered."
643+
642644
if [[ $distro != "debian" && $distro != "fedora-atomic" ]]; then
643645
echo
644646
warn "Before continuing, make sure that your system is fully updated first!"
@@ -837,7 +839,7 @@ version_get() {
837839
}
838840

839841
version_check() {
840-
if [[ $no_version_check == 1 ]]; then
842+
if [[ $no_version_check == 1 && ! -e ../resources/new ]]; then
841843
warn "No version check flag detected, update check is disabled and no support will be provided."
842844
return
843845
fi
@@ -1194,6 +1196,9 @@ device_get_info() {
11941196
device_latest_bb, device_latest_bb_sha1, device_proc
11951197
'
11961198

1199+
if [[ ! -s $ideviceinfo ]]; then
1200+
error "ideviceinfo not found. Make sure to update the script and/or check your Internet connection."
1201+
fi
11971202
if [[ $device_argmode == "none" ]]; then
11981203
log "No device mode is enabled."
11991204
device_mode="none"

0 commit comments

Comments
 (0)