Skip to content

Commit 8fc0954

Browse files
patch files from mirror instead of root
this way we dont accidentally patch already patched files and also dont need the checks to remove already existing v4a drivers from the audio effects files
1 parent 4545514 commit 8fc0954

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

magiskmodule/customize.sh

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ SDCARD="/storage/emulated/0"
77
FOLDER="$SDCARD/Android/data/$VIPERFXPACKAGE/files"
88

99
IFS=$'\n'
10+
SEARCH_ROOT="$(magisk --path)/.magisk/mirror"/
11+
[ ! -d "$SEARCH_ROOT" ] && SEARCH_ROOT=/
1012

1113
# Uninstall v4a app if installed
1214
[ -n "$(pm list packages | grep "$VIPERFXPACKAGE")" ] && pm uninstall -k "$VIPERFXPACKAGE" &>/dev/null
@@ -54,24 +56,25 @@ EFFECT_NAME="v4a_fx"
5456
EFFECT_UUID="41d3c987-e6cf-11e3-a88a-11aba5d5c51b"
5557
LIBRARY_FILE="lib$EFFECT_NAME.so"
5658
LIBRARY_FILE_PATH="/system/vendor/lib/soundfx/$LIBRARY_FILE"
57-
AUDIO_EFFECTS_FILES="$(find /system /vendor -type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml")"
59+
AUDIO_EFFECTS_FILES="$( \
60+
find -H \
61+
$SEARCH_ROOT/system $SEARCH_ROOT/vendor \
62+
-type f -name "*audio_effects*.conf" -o -name "*audio_effects*.xml" \
63+
| sed "s|^$SEARCH_ROOT||" )"
5864
for ORIGINAL_FILE in $AUDIO_EFFECTS_FILES; do
5965
ui_print " Patching $ORIGINAL_FILE"
60-
FILE="$MODPATH"/"$(sed -e 's|^/system/|/|g' -e 's|^/|/system/|' <<< "$ORIGINAL_FILE")"
66+
FILE="$MODPATH"/"$(echo "$ORIGINAL_FILE" | sed -e 's|^/system/|/|g' -e 's|^/|/system/|')"
6167
mkdir -p "$(dirname $FILE)"
68+
ORIGINAL_FILE="$SEARCH_ROOT"/"$ORIGINAL_FILE"
6269
case "$FILE" in
6370
*.conf)
6471
sed \
65-
-e "/v4a_standard_fx {/,/}/d"
66-
-e "/v4a_fx {/,/}/d"
6772
-e "s|^effects {|effects {\n $LIBRARY_NAME {\n library $EFFECT_NAME\n uuid $EFFECT_UUID\n }|" \
6873
-e "s|^libraries {|libraries {\n $EFFECT_NAME {\n path $LIBRARY_FILE_PATH\n }|" \
6974
< "$ORIGINAL_FILE" > "$FILE"
7075
;;
7176
*.xml)
7277
sed \
73-
-e "/v4a_standard_fx/d"
74-
-e "/v4a_fx/d"
7578
-e "s|<libraries>|<libraries>\n <library name=\"$EFFECT_NAME\" path=\"$LIBRARY_FILE\"/>|" \
7679
-e "s|<effects>|<effects>\n <effect name=\"$LIBRARY_NAME\" library=\"$EFFECT_NAME\" uuid=\"$EFFECT_UUID\"/>|" \
7780
< "$ORIGINAL_FILE" > "$FILE"

0 commit comments

Comments
 (0)