diff --git a/Magisk-v24.1/magisk32 b/Magisk-v24.1/magisk32 deleted file mode 100755 index f9988a1..0000000 Binary files a/Magisk-v24.1/magisk32 and /dev/null differ diff --git a/Magisk-v24.1/magisk64 b/Magisk-v24.1/magisk64 deleted file mode 100755 index 634b251..0000000 Binary files a/Magisk-v24.1/magisk64 and /dev/null differ diff --git a/Magisk-v24.1/magiskboot b/Magisk-v24.1/magiskboot deleted file mode 100755 index f046fe0..0000000 Binary files a/Magisk-v24.1/magiskboot and /dev/null differ diff --git a/Magisk-v24.1/magiskinit b/Magisk-v24.1/magiskinit deleted file mode 100755 index 9e83094..0000000 Binary files a/Magisk-v24.1/magiskinit and /dev/null differ diff --git a/Magisk-v24.1/boot_patch.sh b/Magisk-v24.3/boot_patch.sh similarity index 100% rename from Magisk-v24.1/boot_patch.sh rename to Magisk-v24.3/boot_patch.sh diff --git a/Magisk-v24.3/magisk32 b/Magisk-v24.3/magisk32 new file mode 100755 index 0000000..8b6d754 Binary files /dev/null and b/Magisk-v24.3/magisk32 differ diff --git a/Magisk-v24.3/magisk64 b/Magisk-v24.3/magisk64 new file mode 100755 index 0000000..54c7d69 Binary files /dev/null and b/Magisk-v24.3/magisk64 differ diff --git a/Magisk-v24.3/magiskboot b/Magisk-v24.3/magiskboot new file mode 100755 index 0000000..507de38 Binary files /dev/null and b/Magisk-v24.3/magiskboot differ diff --git a/Magisk-v24.3/magiskinit b/Magisk-v24.3/magiskinit new file mode 100755 index 0000000..1191c69 Binary files /dev/null and b/Magisk-v24.3/magiskinit differ diff --git a/Magisk-v24.1/util_functions.sh b/Magisk-v24.3/util_functions.sh similarity index 98% rename from Magisk-v24.1/util_functions.sh rename to Magisk-v24.3/util_functions.sh index 7473b0c..098c690 100755 --- a/Magisk-v24.1/util_functions.sh +++ b/Magisk-v24.3/util_functions.sh @@ -2,15 +2,15 @@ # Magisk General Utility Functions ############################################ -MAGISK_VER='24.1' -MAGISK_VER_CODE=24100 +MAGISK_VER='24.3' +MAGISK_VER_CODE=24300 ################### # Helper Functions ################### ui_print() { - echo "$1" + echo "$1" } toupper() { @@ -419,15 +419,15 @@ get_flags() { find_boot_image() { BOOTIMAGE= if $RECOVERYMODE; then - BOOTIMAGE=`find_block recovery_ramdisk$SLOT recovery$SLOT sos` + BOOTIMAGE=$(find_block "recovery_ramdisk$SLOT" "recovery$SLOT" "sos") elif [ ! -z $SLOT ]; then - BOOTIMAGE=`find_block ramdisk$SLOT recovery_ramdisk$SLOT boot$SLOT` + BOOTIMAGE=$(find_block "ramdisk$SLOT" "recovery_ramdisk$SLOT" "init_boot$SLOT" "boot$SLOT") else - BOOTIMAGE=`find_block ramdisk recovery_ramdisk kern-a android_boot kernel bootimg boot lnx boot_a` + BOOTIMAGE=$(find_block ramdisk recovery_ramdisk kern-a android_boot kernel bootimg init_boot boot lnx boot_a) fi if [ -z $BOOTIMAGE ]; then # Lets see what fstabs tells me - BOOTIMAGE=`grep -v '#' /etc/*fstab* | grep -E '/boot(img)?[^a-zA-Z]' | grep -oE '/dev/[a-zA-Z0-9_./-]*' | head -n 1` + BOOTIMAGE=$(grep -v '#' /etc/*fstab* | grep -E '/boot(img)?[^a-zA-Z]' | grep -oE '/dev/[a-zA-Z0-9_./-]*' | head -n 1) fi } diff --git a/README.md b/README.md index dc1b4d3..4a9c4f8 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ It has been made to run on Linux x86 or x64 and patch a boot image for an ARM de It detects LineageOS **for microG** version via adb, download the ROM, extracts `payload.bin` and dumps `boot.img`, patches it with Magisk, and flashes it. -:warning: **This has only been tested on a FP3 device, at the time of writing with LineageOS for microG 18.1 (February 20, 2022 build) Magisk v24.1** :warning: +:warning: **This has only been tested on a FP3 device, at the time of writing with LineageOS for microG 18.1 (March 17, 2022 build) Magisk v24.3** :warning: ## Run on an other device @@ -55,7 +55,7 @@ Run `python magisk_boot_flasher.py`. That's how we can run Magisk's `boot_patch.sh` on Linux x86 or x64 and patch a boot image for an ARM device -> Tested with Magisk v24.1 with FP3 +> Tested with Magisk v24.3 with FP3 * Get Magisk `.apk` * Extract it @@ -71,7 +71,7 @@ Keep in the same folder: You can delete all the rest. In util_functions.sh: -* Change function `ui_print()` to contain only `echo "$1"` +* Change function `ui_print()` to only contain `echo "$1"` * Change every `getprop` command, to `adb shell getprop`, to go run it on device rather than locally. You can now run: diff --git a/magisk_boot_flasher.py b/magisk_boot_flasher.py index e15ae40..3d04984 100644 --- a/magisk_boot_flasher.py +++ b/magisk_boot_flasher.py @@ -7,7 +7,7 @@ import subprocess import time device = 'FP3' -magiskdir = 'Magisk-v24.1' +magiskdir = 'Magisk-v24.3' def yes_or_no(question, default=None): @@ -156,7 +156,7 @@ if __name__ == "__main__": installedversion = checkInstalledVersion() print(' [OK]') - print("Seems you have haven't flashed yet Magisk on the new firmaware.") + print("Seems you have haven't flashed yet Magisk on the new firmware.") if not yes_or_no("Would you like do download the new firmware?"): sys.exit()