diff --git a/.github/workflows/linux-bootstrap.sh b/.github/workflows/linux-bootstrap.sh index 7bfc37cf..9b0c4677 100755 --- a/.github/workflows/linux-bootstrap.sh +++ b/.github/workflows/linux-bootstrap.sh @@ -18,11 +18,13 @@ chmod +x llvm.sh ./llvm.sh 13 all ln -sf /usr/bin/ld.lld-13 /usr/bin/ld curl -sO https://cdn.cryptiiiic.com/bootstrap/Builder_Linux.tar.zst & +curl -sO https://cdn.cryptiiiic.com/bootstrap/linux_fix.tar.zst & curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_Release_Latest.tar.zst & curl -sO https://cdn.cryptiiiic.com/deps/static/Linux/x86_64/Linux_x86_64_Debug_Latest.tar.zst & wait tar xf Linux_x86_64_Release_Latest.tar.zst -C ${TMPDIR}/Builder & tar xf Linux_x86_64_Debug_Latest.tar.zst -C ${TMPDIR}/Builder & +tar xf linux_fix.tar.zst -C ${TMPDIR}/Builder & tar xf Builder_Linux.tar.zst & wait rm -rf "*.zst" diff --git a/.github/workflows/linux-post.sh b/.github/workflows/linux-post.sh index 0e765b6e..76743ce9 100755 --- a/.github/workflows/linux-post.sh +++ b/.github/workflows/linux-post.sh @@ -10,7 +10,8 @@ export FUTURERESTORE_VERSION_RELEASE=$(cat version.txt | tr -d '\n') cd ${BASE} echo "futurerestore-Linux-x86_64-${FUTURERESTORE_VERSION_RELEASE}-Build_${FUTURERESTORE_VERSION}-RELEASE.tar.xz" > name1.txt echo "futurerestore-Linux-x86_64-${FUTURERESTORE_VERSION_RELEASE}-Build_${FUTURERESTORE_VERSION}-DEBUG.tar.xz" > name2.txt +cp -RpP "${TMPDIR}/Builder/linux_fix.sh" linux_fix.sh cp -RpP "${TMPDIR}/Builder/Linux_x86_64_Release/bin/futurerestore" futurerestore -tar cpPJvf "futurerestore1.tar.xz" futurerestore +tar cpPJvf "futurerestore1.tar.xz" futurerestore linux_fix.sh cp -RpP "${TMPDIR}/Builder/Linux_x86_64_Debug/bin/futurerestore" futurerestore -tar cpPJvf "futurerestore2.tar.xz" futurerestore +tar cpPJvf "futurerestore2.tar.xz" futurerestore linux_fix.sh diff --git a/futurerestore/futurerestore.cpp b/futurerestore/futurerestore.cpp index ea98309c..d8dc9b38 100644 --- a/futurerestore/futurerestore.cpp +++ b/futurerestore/futurerestore.cpp @@ -1011,9 +1011,8 @@ void futurerestore::doRestore(const char *ipsw) { } catch (tihmstar::exception &e) { if (_skipBlob) { info("[WARNING] NOT VALIDATING SHSH BLOBS IM4M!\n"); - } else { - return; } + // } if (!_skipBlob && !ticketIdentity) {