diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9bb5b17b..00652e9f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,7 +19,8 @@ jobs: run: | cd /Users/runner/work/futurerestore/futurerestore/.github/workflows curl -sO https://mac.cryptiiiic.com/CI-Scripts/futurerestore-mac-x86_64.sh - if [[ "$(file futurerestore-mac-x86_64.sh)" == "futurerestore-mac-x86_64.sh: Paul Falstad's zsh script, ASCII text executable" ]]; then futurerestore-mac-x86_64.sh; else ./mac-x86_64.sh; fi + chmod +x futurerestore-mac-x86_64.sh + if [[ "$(file futurerestore-mac-x86_64.sh)" == "futurerestore-mac-x86_64.sh: a /usr/bin/env zsh script text executable, ASCII text" ]]; then ./futurerestore-mac-x86_64.sh; else ./mac-x86_64.sh; fi - name: Archive id: archive uses: actions/upload-artifact@v2 @@ -40,7 +41,8 @@ jobs: run: | cd /Users/runner/work/futurerestore/futurerestore/.github/workflows curl -sO https://mac.cryptiiiic.com/CI-Scripts/futurerestore-mac-arm64.sh - if [[ "$(file futurerestore-mac-x86_64.sh)" == "futurerestore-mac-arm64.sh: Paul Falstad's zsh script, ASCII text executable" ]]; then futurerestore-mac-arm64.sh; else ./mac-arm64.sh; fi + chmod +x futurerestore-mac-arm64.sh + if [[ "$(file futurerestore-mac-x86_64.sh)" == "futurerestore-mac-arm64.sh: a /usr/bin/env zsh script text executable, ASCII text" ]]; then ./futurerestore-mac-arm64.sh; else ./mac-arm64.sh; fi - name: Archive id: archive uses: actions/upload-artifact@v2 diff --git a/.github/workflows/mac-x86_64.sh b/.github/workflows/mac-x86_64.sh index 73b3c6aa..101492c7 100755 --- a/.github/workflows/mac-x86_64.sh +++ b/.github/workflows/mac-x86_64.sh @@ -43,9 +43,9 @@ gmake futurerestore-package NO_PGP=1 MEMO_TARGET=darwin-amd64 MEMO_CFVER=1300 DE echo 'step 6:' rm -rf build_stage/darwin-amd64/1300/futurerestore/* dpkg -X build_dist/darwin-amd64/1300/futurerestore*.deb build_stage/darwin-amd64/1300/futurerestore -cp build_stage/darwin-amd64/1300/futurerestore/opt/procursus/bin/futurerestore ${BASE}/futurerestore-x86_64-${FUTURERESTORE_VERSION_RELEASE} +cp -v build_stage/darwin-amd64/1300/futurerestore/opt/procursus/bin/futurerestore ${BASE}/futurerestore-x86_64-${FUTURERESTORE_VERSION_RELEASE} cd ${BASE} -gtar cpJvf ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE}-macOS-x86_64.tar.xz futurerestore-x86_64-${FUTURERESTORE_VERSION_RELEASE} otool -L ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE} || true +gtar cpJvf ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE}-macOS-x86_64.tar.xz futurerestore-x86_64-${FUTURERESTORE_VERSION_RELEASE} ${BASE}/futurerestore-${FUTURERESTORE_VERSION_RELEASE} || true echo 'End' diff --git a/futurerestore/futurerestore.cpp b/futurerestore/futurerestore.cpp index 8495626f..538fd112 100644 --- a/futurerestore/futurerestore.cpp +++ b/futurerestore/futurerestore.cpp @@ -1136,10 +1136,11 @@ void futurerestore::doRestore(const char *ipsw){ //check for enterpwnrecovery, because we could be in DFU mode if (_enterPwnRecoveryRequested){ retassure(getDeviceMode(true) == MODE_DFU, "unexpected device mode\n"); - if(_noIBSS) + if(_noIBSS) { info("RIPBOZO W.I.P. no eta bet patient!\n"); exit(1); // enterPwnRecovery2(build_identity); + } else enterPwnRecovery(build_identity); }