TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-12-03 05:21:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not force LD_LIBRARY_PATH in recovery

Browse Source
This commit is contained in:
topjohnwu
2018-05-06 01:48:24 +08:00
parent 3a9a3ed184
commit 25703c1750
3 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
scripts/magisk_uninstaller.sh
View File

@@ -45,7 +45,7 @@ cd $MAGISKBIN
ui_print "- Found Boot Image: $BOOTIMAGE"
ui_print "- Unpacking boot image"
eval $LIB32PFX ./magiskboot --unpack "$BOOTIMAGE"
./magiskboot --unpack "$BOOTIMAGE"
CHROMEOS=false
case $? in
@@ -67,7 +67,7 @@ esac
# Detect boot image state
ui_print "- Checking ramdisk status"
eval $LIB32PFX ./magiskboot --cpio ramdisk.cpio test
./magiskboot --cpio ramdisk.cpio test
case $? in
0 ) # Stock boot
ui_print "- Stock boot image detected"
@@ -76,14 +76,14 @@ case $? in
1|2 ) # Magisk patched
ui_print "- Magisk patched image detected"
# Find SHA1 of stock boot image
[ -z $SHA1 ] && SHA1=`eval $LIB32PFX ./magiskboot --cpio ramdisk.cpio sha1 2>/dev/null`
[ -z $SHA1 ] && SHA1=`./magiskboot --cpio ramdisk.cpio sha1 2>/dev/null`
OK=false
[ ! -z $SHA1 ] && restore_imgs $SHA1 && OK=true
if ! $OK; then
ui_print "! Boot image backup unavailable"
ui_print "- Restoring ramdisk with internal backup"
eval $LIB32PFX ./magiskboot --cpio ramdisk.cpio restore
eval $LIB32PFX ./magiskboot --repack $BOOTIMAGE
./magiskboot --cpio ramdisk.cpio restore
./magiskboot --repack $BOOTIMAGE
# Sign chromeos boot
$CHROMEOS && sign_chromeos
flash_boot_image new-boot.img "$BOOTIMAGE"