Skip to content

fix: Use Magisk mirror only when it is really possible #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open

fix: Use Magisk mirror only when it is really possible #67

Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3de95d
fix: Update magisk mirror check to fix 'No such file or directory' error
Apr 20, 2025
9093262
refactor: move codeblock back to it's original place
energypatrikhu May 22, 2025
f25b2c1
fix: check the contents of the mirror folder instead of checking the …
energypatrikhu May 22, 2025
89dada7
style: remove indentation
energypatrikhu May 28, 2025
0820352
fix: check if magisk is available before trying to set MIRROR
energypatrikhu Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,13 @@ internal object Constants {

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"
# 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=""
fi
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no reason to first set MIRROR and then unset it again. Invert the if condition and only set the variable then.

Copy link
Author

@energypatrikhu energypatrikhu May 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inverting the if check means we would have to write the path twice

then this would change

MIRROR="${'$'}MAGISKTMP/.magisk/mirror"
if [ -z "$(ls -A "${'$'}MIRROR" 2>/dev/null)" ]; then
    MIRROR=""
fi

to

if [ -n "$(ls -A "${'$'}MAGISKTMP/.magisk/mirror" 2>/dev/null)" ]; then
    MIRROR="${'$'}MAGISKTMP/.magisk/mirror"
fi

as we need to check if the .magisk/mirror is not empty.

I think the how it is currently is good because it avoids the need to write the path twice,
but if you prefer the inverted logic I can change it.


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.
Expand Down