Skip to content

fix: Interpret package name as a string instead of Regex when using grep #68

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

Merged
merged 2 commits into from
May 2, 2025
Merged

fix: Interpret package name as a string instead of Regex when using grep #68

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18531a6
fix: MOUNT_GREP to grep by fixed string
laur89 Apr 23, 2025
e608bfc
chore: extract SELinux security context to a var
laur89 Apr 26, 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
7 changes: 4 additions & 3 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 @@ -4,13 +4,14 @@ package app.revanced.library.installation.installer
internal object Constants {
const val PLACEHOLDER = "PLACEHOLDER"

const val SELINUX_CONTEXT = "u:object_r:apk_data_file:s0"
const val TMP_FILE_PATH = "/data/local/tmp/revanced.tmp"
const val MOUNT_PATH = "/data/adb/revanced/"
const val MOUNTED_APK_PATH = "$MOUNT_PATH$PLACEHOLDER.apk"
const val MOUNT_SCRIPT_PATH = "/data/adb/service.d/mount_revanced_$PLACEHOLDER.sh"

const val EXISTS = "[[ -f $PLACEHOLDER ]] || exit 1"
const val MOUNT_GREP = "grep $PLACEHOLDER /proc/mounts"
const val MOUNT_GREP = "grep -F $PLACEHOLDER /proc/mounts"
const val DELETE = "rm -rf $PLACEHOLDER"
const val CREATE_DIR = "mkdir -p"
const val RESTART = "am start -S $PLACEHOLDER"
Expand All @@ -23,7 +24,7 @@ internal object Constants {
"mv $TMP_FILE_PATH \$base_path && " +
"chmod 644 \$base_path && " +
"chown system:system \$base_path && " +
"chcon u:object_r:apk_data_file:s0 \$base_path"
"chcon $SELINUX_CONTEXT \$base_path"

const val UMOUNT =
"grep $PLACEHOLDER /proc/mounts | " +
Expand Down Expand Up @@ -52,7 +53,7 @@ internal object Constants {

base_path="$MOUNTED_APK_PATH"

chcon u:object_r:apk_data_file:s0 ${'$'}base_path
chcon $SELINUX_CONTEXT ${'$'}base_path

# Use Magisk mirror, if possible.
if command -v magisk &> /dev/null; then
Expand Down