Skip to content

Commit 254f36d

Browse files
authored
fix: Interpret package name as a string instead of Regex when using grep (#68)
1 parent 4065c87 commit 254f36d

File tree

1 file changed

+4
-3
lines changed
  • src/commonMain/kotlin/app/revanced/library/installation/installer

1 file changed

+4
-3
lines changed

src/commonMain/kotlin/app/revanced/library/installation/installer/Constants.kt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ package app.revanced.library.installation.installer
44
internal object Constants {
55
const val PLACEHOLDER = "PLACEHOLDER"
66

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

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

2829
const val UMOUNT =
2930
"grep $PLACEHOLDER /proc/mounts | " +
@@ -52,7 +53,7 @@ internal object Constants {
5253
5354
base_path="$MOUNTED_APK_PATH"
5455
55-
chcon u:object_r:apk_data_file:s0 ${'$'}base_path
56+
chcon $SELINUX_CONTEXT ${'$'}base_path
5657
5758
# Use Magisk mirror, if possible.
5859
if command -v magisk &> /dev/null; then

0 commit comments

Comments
 (0)