From e3de95d8adadc9b42db38bfeaba0f7d03993bfc1 Mon Sep 17 00:00:00 2001 From: energypatrikhu Date: Sun, 20 Apr 2025 23:14:37 +0200 Subject: [PATCH 1/5] fix: Update magisk mirror check to fix 'No such file or directory' error --- .../library/installation/installer/Constants.kt | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt index 24d9da1..6bc87ba 100644 --- a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt +++ b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt @@ -37,6 +37,13 @@ internal object Constants { val MOUNT_SCRIPT = """ #!/system/bin/sh + # Mount using Magisk mirror, if available. + MAGISKTMP="$( magisk --path )" || MAGISKTMP=/sbin + MIRROR="${'$'}MAGISKTMP/.magisk/mirror" + if [ ! -f ${'$'}MIRROR ]; then + MIRROR="" + fi + until [ "$( getprop sys.boot_completed )" = 1 ]; do sleep 3; done until [ -d "/sdcard/Android" ]; do sleep 1; done @@ -53,12 +60,6 @@ internal object Constants { base_path="$MOUNTED_APK_PATH" chcon u:object_r:apk_data_file:s0 ${'$'}base_path - - # Use Magisk mirror, if possible. - if command -v magisk &> /dev/null; then - MIRROR="${'$'}(magisk --path)/.magisk/mirror" - fi - mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path # Kill the app to force it to restart the mounted APK in case it's currently running. From 9093262edb10947131f4c1ca51b2f199876e7f2a Mon Sep 17 00:00:00 2001 From: EnergyPatrikHU <74842806+energypatrikhu@users.noreply.github.com> Date: Thu, 22 May 2025 15:28:05 +0200 Subject: [PATCH 2/5] refactor: move codeblock back to it's original place --- .../library/installation/installer/Constants.kt | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt index 6bc87ba..77db6d7 100644 --- a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt +++ b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt @@ -37,13 +37,6 @@ internal object Constants { val MOUNT_SCRIPT = """ #!/system/bin/sh - # Mount using Magisk mirror, if available. - MAGISKTMP="$( magisk --path )" || MAGISKTMP=/sbin - MIRROR="${'$'}MAGISKTMP/.magisk/mirror" - if [ ! -f ${'$'}MIRROR ]; then - MIRROR="" - fi - until [ "$( getprop sys.boot_completed )" = 1 ]; do sleep 3; done until [ -d "/sdcard/Android" ]; do sleep 1; done @@ -60,6 +53,14 @@ internal object Constants { base_path="$MOUNTED_APK_PATH" chcon u:object_r:apk_data_file:s0 ${'$'}base_path + + # Mount using Magisk mirror, if available. + MAGISKTMP="$( magisk --path )" || MAGISKTMP=/sbin + MIRROR="${'$'}MAGISKTMP/.magisk/mirror" + if [ ! -f ${'$'}MIRROR ]; then + MIRROR="" + fi + mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path # Kill the app to force it to restart the mounted APK in case it's currently running. From f25b2c11523ebfc6d9c6e3a813d207f3b83a4953 Mon Sep 17 00:00:00 2001 From: EnergyPatrikHU <74842806+energypatrikhu@users.noreply.github.com> Date: Thu, 22 May 2025 17:41:35 +0200 Subject: [PATCH 3/5] fix: check the contents of the mirror folder instead of checking the existence of the folder --- .../app/revanced/library/installation/installer/Constants.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt index 77db6d7..03fb1bd 100644 --- a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt +++ b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt @@ -57,7 +57,7 @@ internal object Constants { # Mount using Magisk mirror, if available. MAGISKTMP="$( magisk --path )" || MAGISKTMP=/sbin MIRROR="${'$'}MAGISKTMP/.magisk/mirror" - if [ ! -f ${'$'}MIRROR ]; then + if [ -z "$(ls -A "${'$'}MIRROR" 2>/dev/null)" ]; then MIRROR="" fi From 89dada751ea16077aa266ee22c59e8ebbce29283 Mon Sep 17 00:00:00 2001 From: EnergyPatrikHU <74842806+energypatrikhu@users.noreply.github.com> Date: Wed, 28 May 2025 22:18:56 +0200 Subject: [PATCH 4/5] style: remove indentation Co-authored-by: oSumAtrIX --- .../app/revanced/library/installation/installer/Constants.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt index 03fb1bd..0a66b8a 100644 --- a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt +++ b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt @@ -60,7 +60,6 @@ internal object Constants { if [ -z "$(ls -A "${'$'}MIRROR" 2>/dev/null)" ]; then MIRROR="" fi - mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path # Kill the app to force it to restart the mounted APK in case it's currently running. From 0820352259ff57df9ed6d340cd4bd24ebb12c470 Mon Sep 17 00:00:00 2001 From: EnergyPatrikHU <74842806+energypatrikhu@users.noreply.github.com> Date: Tue, 3 Jun 2025 18:33:07 +0200 Subject: [PATCH 5/5] fix: check if magisk is available before trying to set MIRROR --- .../library/installation/installer/Constants.kt | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt index 0a66b8a..3706883 100644 --- a/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt +++ b/src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt @@ -55,11 +55,14 @@ internal object Constants { chcon u:object_r:apk_data_file:s0 ${'$'}base_path # Mount using Magisk mirror, if available. - MAGISKTMP="$( magisk --path )" || MAGISKTMP=/sbin - MIRROR="${'$'}MAGISKTMP/.magisk/mirror" - if [ -z "$(ls -A "${'$'}MIRROR" 2>/dev/null)" ]; then - MIRROR="" + if command -v magisk &> /dev/null; then + MAGISKTMP="${'$'}(magisk --path)" || MAGISKTMP=/sbin + MIRROR="${'$'}MAGISKTMP/.magisk/mirror" + if [ -z "$(ls -A "${'$'}MIRROR" 2>/dev/null)" ]; then + MIRROR="" + fi fi + mount -o bind ${'$'}MIRROR${'$'}base_path ${'$'}stock_path # Kill the app to force it to restart the mounted APK in case it's currently running.