More consistent replace file naming, retain custom through an update

This commit is contained in:
osm0sis
2024-01-09 10:52:17 -04:00
parent 05927c60e1
commit 21a309dd12
3 changed files with 29 additions and 25 deletions

View File

@@ -3,6 +3,14 @@ if [ "$API" -lt 26 ]; then
abort "! You can't use this module on Android < 8.0" abort "! You can't use this module on Android < 8.0"
fi fi
# Copy any supported custom files to updated module
for FILE in custom.app_replace.list custom.pif.json; do
if [ -f "/data/adb/modules/playintegrityfix/$FILE" ]; then
ui_print "- Restoring $FILE"
cp -af /data/adb/modules/playintegrityfix/$FILE $MODPATH/$FILE
fi
done
# Remove/warn if conflicting modules are installed # Remove/warn if conflicting modules are installed
if [ -d /data/adb/modules/safetynet-fix ]; then if [ -d /data/adb/modules/safetynet-fix ]; then
touch /data/adb/modules/safetynet-fix/remove touch /data/adb/modules/safetynet-fix/remove
@@ -13,22 +21,16 @@ if [ -d /data/adb/modules/MagiskHidePropsConf ]; then
fi fi
# Replace conflicting custom ROM injection app folders to disable them # Replace conflicting custom ROM injection app folders to disable them
if [ -f "$MODPATH/app_replace.list" ]; then LIST=$MODPATH/example.app_replace.list
for APP in $(grep -v '^#' "$MODPATH/app_replace.list"); do [ -f "$MODPATH/custom.app_replace.list" ] && LIST=$MODPATH/custom.app_replace.list
if [ -d "$APP" ]; then for APP in $(grep -v '^#' $LIST); do
HIDEDIR="$MODPATH/$APP" if [ -d "$APP" ]; then
mkdir -p "$HIDEDIR" HIDEDIR=$MODPATH/$APP
touch "$HIDEDIR/.replace" mkdir -p $HIDEDIR
ui_print "- $(basename $APP) app disabled" touch $HIDEDIR/.replace
fi ui_print "! $(basename $APP) ROM app disabled"
done fi
fi done
# Copy any custom.pif.json to updated module
if [ -f /data/adb/modules/playintegrityfix/custom.pif.json ]; then
ui_print "- Restoring custom.pif.json"
cp -af /data/adb/modules/playintegrityfix/custom.pif.json $MODPATH/custom.pif.json
fi
# Migrate custom.pif.json to latest defaults if needed # Migrate custom.pif.json to latest defaults if needed
if [ -f "$MODPATH/custom.pif.json" ] && ! grep -q "api_level" $MODPATH/custom.pif.json; then if [ -f "$MODPATH/custom.pif.json" ] && ! grep -q "api_level" $MODPATH/custom.pif.json; then

View File

@@ -1,3 +1,5 @@
# Rename to custom.app_replace.list once customized
#
# Add conflicting custom ROM injection app folder paths to this list # Add conflicting custom ROM injection app folder paths to this list
# and they will be replaced systemlessly to disable them # and they will be replaced systemlessly to disable them

View File

@@ -12,15 +12,15 @@ if [ -d /data/adb/modules/safetynet-fix ]; then
fi fi
# Replace conflicting custom ROM injection app folders to disable them # Replace conflicting custom ROM injection app folders to disable them
if [ -f "$MODDIR/app_replace.list" ]; then LIST=$MODDIR/example.app_replace.list
for APP in $(grep -v '^#' "$MODDIR/app_replace.list"); do [ -f "$MODDIR/custom.app_replace.list" ] && LIST=$MODDIR/custom.app_replace.list
if [ -d "$APP" ]; then for APP in $(grep -v '^#' $LIST); do
HIDEDIR="$MODDIR/$APP" if [ -d "$APP" ]; then
mkdir -p "$HIDEDIR" HIDEDIR=$MODDIR/$APP
touch "$HIDEDIR/.replace" mkdir -p $HIDEDIR
fi touch $HIDEDIR/.replace
done fi
fi done
# Conditional early sensitive properties # Conditional early sensitive properties