diff --git a/restore.sh b/restore.sh index b407447..493669d 100755 --- a/restore.sh +++ b/restore.sh @@ -300,7 +300,7 @@ function Downgrade { if [ ! -e $IPSWCustom.ipsw ]; then Log "Verifying IPSW..." IPSWSHA1=$(cat $Firmware/$BuildVer/sha1sum) - IPSWSHA1L=$(shasum -a 1 $IPSW.ipsw | awk '{print $1}') + IPSWSHA1L=$(shasum $IPSW.ipsw | awk '{print $1}') [[ $IPSWSHA1L != $IPSWSHA1 ]] && Error "Verifying IPSW failed. Delete/replace the IPSW and run the script again" else IPSW=$IPSWCustom @@ -379,7 +379,7 @@ function Downgrade { else cp saved/$ProductType/*.bbfw saved/$ProductType/BuildManifest.plist . fi - BasebandSHA1L=$(shasum -a 1 $Baseband | awk '{print $1}') + BasebandSHA1L=$(shasum $Baseband | awk '{print $1}') Log "Proceeding to futurerestore..." if [ ! -e *.bbfw ] || [[ $BasebandSHA1L != $BasebandSHA1 ]]; then rm -f saved/$ProductType/*.bbfw saved/$ProductType/BuildManifest.plist @@ -424,17 +424,10 @@ function InstallDependencies { sudo add-apt-repository universe sudo apt update sudo apt install -y autoconf automake binutils bsdiff build-essential checkinstall curl git libimobiledevice-utils libplist3 libreadline-dev libtool-bin libusb-1.0-0-dev libusbmuxd6 libusbmuxd-tools libzip5 openssh-client python2 python3 usbmuxd usbutils - SavePkg http://archive.ubuntu.com/ubuntu/pool/universe/c/curl3/libcurl3_7.58.0-2ubuntu2_amd64.deb libcurl3.deb - VerifyPkg libcurl3.deb f6ab4c77f7c4680e72f9dd754f706409c8598a9f + SavePkg ar x libcurl3.deb data.tar.xz tar xf data.tar.xz sudo cp usr/lib/x86_64-linux-gnu/libcurl.so.4.* /usr/lib/libcurl.so.3 - SavePkg http://ppa.launchpad.net/linuxuprising/libpng12/ubuntu/pool/main/libp/libpng/libpng12-0_1.2.54-1ubuntu1.1+1~ppa0~focal_amd64.deb libpng12.deb - VerifyPkg libpng12.deb 4ceaaa02d2af09d0cdf1074372ed5df10b90b088 - SavePkg http://archive.ubuntu.com/ubuntu/pool/main/o/openssl1.0/libssl1.0.0_1.0.2n-1ubuntu5.3_amd64.deb libssl1.0.0.deb - VerifyPkg libssl1.0.0.deb 573f3b5744c4121431179abee144543fc662e8b1 - SavePkg http://archive.ubuntu.com/ubuntu/pool/universe/libz/libzip/libzip4_1.1.2-1.1_amd64.deb libzip4.deb - VerifyPkg libzip4.deb 449ce0b3de6772f6fab0ec680fde641fb3428a28 sudo dpkg -i libpng12.deb libssl1.0.0.deb libzip4.deb sudo ln -sf /usr/lib/x86_64-linux-gnu/libimobiledevice.so.6 /usr/local/lib/libimobiledevice-1.0.so.6 sudo ln -sf /usr/lib/x86_64-linux-gnu/libplist.so.3 /usr/local/lib/libplist-2.0.so.3 @@ -442,8 +435,7 @@ function InstallDependencies { elif [[ $ID == "fedora" ]]; then sudo dnf install -y automake bsdiff git libimobiledevice-utils libpng12 libtool libusb-devel libusbmuxd-utils libzip make perl-Digest-SHA python2 python readline-devel - SavePkg http://ftp.pbone.net/mirror/ftp.scientificlinux.org/linux/scientific/6.1/x86_64/os/Packages/openssl-1.0.0-10.el6.x86_64.rpm openssl-1.0.0.rpm - VerifyPkg openssl-1.0.0.rpm 10e7e37c0eac8e7ea8c0657596549d7fe9dac454 + SavePkg rpm2cpio openssl-1.0.0.rpm | cpio -idmv sudo cp usr/lib64/libcrypto.so.1.0.0 usr/lib64/libssl.so.1.0.0 /usr/lib64 sudo ln -sf /usr/lib64/libimobiledevice.so.6 /usr/local/lib/libimobiledevice-1.0.so.6 @@ -505,22 +497,16 @@ function SaveExternal { } function SavePkg { - if [[ ! -e ../saved/pkg/$2 ]]; then - mkdir -p ../saved/pkg 2>/dev/null - Log "Downloading $1..." - curl -L $1 -o $2 - cp $2 ../saved/pkg - else - cp ../saved/pkg/$2 . - fi -} - -function VerifyPkg { - Log "Verifying $1..." - if [[ $(shasum -a 1 $1 | awk '{print $1}') != $2 ]]; then - rm -f ../saved/pkg/$1 - Error "Verifying $1 failed. Please run the script again" "./restore.sh InstallDependencies" + if [[ ! -d ../saved/pkg ]]; then + Log "Downloading packages..." + curl -O https://github.com/LukeZGD/iOS-OTA-Downgrader/releases/download/tools/depends_linux.zip + if [[ $(shasum $1 | awk '{print $1}') != b5db6e4efdccc8a76ec592f7696494a7675a8d28 ]]; then + Error "Verifying failed. Please run the script again" "./restore.sh InstallDependencies" + fi + mkdir -p ../saved/pkg + unzip depends_linux.zip -d ../saved/pkg fi + cp ../saved/pkg/* . } function BasebandDetect {