@@ -4520,14 +4520,11 @@ ipsw_prepare_ios6touch3() {
45204520 local ipsw_base_path2=" ${device_type} _${device_base_vers} _${device_base_build} _Restore"
45214521 local ipsw_custom2=" ${device_type} _${device_target_vers} _${device_target_build} _Custom"
45224522 local jb
4523- local kc=" $sundance /artifacts/kernelcache.n18ap.bin "
4524- local kc_sha1=" 56baaebd7c260f3d41679fee686426ef2578bbd3 "
4525- local kc_url=" https://gist.githubusercontent.com/NyanSatan/1cf6921821484a2f8f788e567b654999/raw/7fa62c2cb54855d72b2a91c2aa3d57cab7318246/magic-A63970m .b64"
4523+ local kc=" ../saved/SundanceResources.b64 "
4524+ local kc_sha1=" ebf508aff198fa80204bf3d6df0114e9b645f1c0 "
4525+ local kc_url=" https://gist.githubusercontent.com/NyanSatan/1cf6921821484a2f8f788e567b654999/raw/54c6ad7554710af454c87ec2d99f869e6e669c99/SundanceResources .b64"
45264526 if [[ $ipsw_jailbreak == 1 ]]; then
45274527 jb=" -j"
4528- kc=" $sundance /artifacts/kernelcache.jailbroken.n18ap.bin"
4529- kc_sha1=" 2c42a07b82d14dab69417f750d0e4ca118bf225c"
4530- kc_url=" https://gist.githubusercontent.com/NyanSatan/1cf6921821484a2f8f788e567b654999/raw/095022a2e8635ec3f3ee3400feb87280fd2c9f17/magic-A63970m-jb.b64"
45314528 fi
45324529
45334530 if [[ -e " $ipsw_custom .ipsw" ]]; then
@@ -4559,16 +4556,24 @@ ipsw_prepare_ios6touch3() {
45594556 fi
45604557
45614558 if [[ ! -s $kc ]]; then
4562- log " Downloading kernelcache: $( basename $kc ) "
4563- download_from_url " $kc_url " kc.b64
4564- base64 --decode kc.b64 | gunzip > $kc
4559+ log " Downloading resources: $( basename $kc ) "
4560+ download_from_url " $kc_url " " $kc "
45654561 fi
45664562
45674563 if [[ $( $sha1sum $kc 2> /dev/null | awk ' {print $1}' ) != " $kc_sha1 " ]]; then
45684564 rm $kc
45694565 error " Downloading/verifying kernelcache failed. Please run the script again"
45704566 fi
45714567
4568+ log " Preparing resources"
4569+ if [[ $platform == " macos" ]]; then
4570+ base64 --decode $kc | tar -xvf -
4571+ else
4572+ base64 --decode $kc | xz -d | tar -xvf -
4573+ fi
4574+ mv artifacts/* $sundance /artifacts/
4575+ mv resources/* $sundance /resources/
4576+
45724577 log " Copying IPSWs..."
45734578 cp " $ipsw_path .ipsw" " $sundance /$ipsw_path2 .ipsw"
45744579 cp " $ipsw_base_path .ipsw" " $sundance /$ipsw_base_path2 .ipsw"
@@ -6131,10 +6136,9 @@ ipsw_prepare() {
61316136 4 )
61326137 if [[ $device_type == " iPod4,1" && $device_target_vers == " 7." * ]]; then
61336138 ipsw_prepare_ios7touch4
6134- elif [[ $device_type == " iPod3,1" && $device_target_vers == " 6." * ]]; then
6139+ elif [[ $device_type == " iPod3,1" && $device_target_vers == " 6." * ]] ||
6140+ [[ $device_type == " iPad1,1" && $device_target_vers == " 6." * ]]; then
61356141 ipsw_prepare_ios6touch3
6136- # elif [[ $device_type == "iPad1,1" && $device_target_vers == "6."* ]]; then
6137- # ipsw_prepare_ios6ipad1
61386142 elif [[ $device_target_tethered == 1 ]]; then
61396143 ipsw_prepare_tethered
61406144 elif [[ $device_target_other == 1 || $ipsw_gasgauge_patch == 1 ]] ||
@@ -8444,7 +8448,7 @@ menu_restore() {
84448448 case $device_type in
84458449 iPod4,1 ) menu_items+=(" 7.1.2" );;
84468450 iPod3,1 ) menu_items+=(" 6.0" " 6.1.3" " 6.1.6" );;
8447- # iPad1,1 ) :;; # for future use
8451+ iPad1,1 ) menu_items+=( " 6.1.3 " );;
84488452 esac
84498453 if [[ $device_canpowder == 1 && $device_proc != 4 ]]; then
84508454 local text2=" 7.1.x"
@@ -9125,7 +9129,7 @@ menu_ipsw_special() {
91259129 6.* ) # for touch 3
91269130 case $device_type in
91279131 iPod3,1 ) device_type_special=" iPhone2,1" ; device_model_special=" n88" ;;
9128- # iPad1,1 ) :;; # for future use
9132+ iPad1,1 ) device_type_special= " iPad2,1 " ; device_model_special= " k93 " ;;
91299133 esac
91309134 ;;
91319135 esac
@@ -9168,7 +9172,7 @@ menu_ipsw_special() {
91689172 echo
91699173 case $1 in
91709174 7.* ) warn " This is a tethered upgrade and has many broken device features. Not recommended unless you know what you are doing." ;;
9171- 6.* ) print " * iOS 6 on touch 3 uses SundanceInH2A by NyanSatan: https://github.com/NyanSatan/SundanceInH2A" ;;
9175+ 6.* ) print " * iOS 6 on touch 3/iPad 1 uses SundanceInH2A by NyanSatan: https://github.com/NyanSatan/SundanceInH2A" ;;
91729176 esac
91739177 menu_items=(" Select Target IPSW" " Select Base IPSW" " Download Target IPSW" " Download Base IPSW" )
91749178 if [[ -n $ipsw_path && -n $ipsw_base_path ]]; then
0 commit comments