From 02003f032b8ab8f70dc24c501a85003fbe988607 Mon Sep 17 00:00:00 2001 From: LukeeGD Date: Sun, 13 Sep 2020 22:26:49 +0800 Subject: [PATCH] Compile irecovery in resources instead of /usr/local --- .gitignore | 1 + resources/tools/pwnedDFU_macos | Bin restore.sh | 10 +++++----- 3 files changed, 6 insertions(+), 5 deletions(-) mode change 100644 => 100755 resources/tools/pwnedDFU_macos diff --git a/.gitignore b/.gitignore index 55eb989..5ec4d10 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,5 @@ iP* saved/ resources/firmware/ resources/ipwndfu/ +resources/libirecovery/ tmp/ diff --git a/resources/tools/pwnedDFU_macos b/resources/tools/pwnedDFU_macos old mode 100644 new mode 100755 diff --git a/restore.sh b/restore.sh index e3f87dc..f5aed0e 100755 --- a/restore.sh +++ b/restore.sh @@ -43,7 +43,7 @@ function Main { ideviceenterrecovery="ideviceenterrecovery" ideviceinfo="ideviceinfo" iproxy="iproxy" - irecovery="env LD_LIBRARY_PATH=resources/lib /usr/local/bin/irecovery" + irecovery="env LD_LIBRARY_PATH=resources/lib resources/libirecovery/bin/irecovery" pwnedDFU="sudo LD_LIBRARY_PATH=resources/lib resources/tools/pwnedDFU_$platform" python="python2" futurerestore1="sudo LD_PRELOAD=resources/lib/libcurl.so.3 LD_LIBRARY_PATH=resources/lib resources/tools/futurerestore1_linux" @@ -540,8 +540,8 @@ function InstallDependencies { if [[ $platform == linux ]]; then Compile LukeZGD libirecovery - ln -sf /usr/local/lib/libirecovery.so.3 ../resources/lib/libirecovery-1.0.so.3 - ln -sf /usr/local/lib/libirecovery.so.3 ../resources/lib/libirecovery.so.3 + ln -sf ../libirecovery/lib/libirecovery.so.3 ../resources/lib/libirecovery-1.0.so.3 + ln -sf ../libirecovery/lib/libirecovery.so.3 ../resources/lib/libirecovery.so.3 else rm -rf ../resources/libimobiledevice_$platform mkdir ../resources/libimobiledevice_$platform @@ -556,8 +556,8 @@ function InstallDependencies { function Compile { git clone --depth 1 https://github.com/$1/$2.git cd $2 - ./autogen.sh - sudo make install + ./autogen.sh --prefix="$(dirname $(dirname $(pwd)))/resources/$2" + make install cd .. sudo rm -rf $2 }