|
|
@ -183,13 +183,11 @@ overrides_list_non () {
|
|
|
|
overrides_clear () {
|
|
|
|
overrides_clear () {
|
|
|
|
if [ "${MODE}" = "MAGISK" -o "${MODE}" = "MAGISK_INSTALL" ]; then
|
|
|
|
if [ "${MODE}" = "MAGISK" -o "${MODE}" = "MAGISK_INSTALL" ]; then
|
|
|
|
echo " removing Overlays from ${OVERLAY_PATH}"
|
|
|
|
echo " removing Overlays from ${OVERLAY_PATH}"
|
|
|
|
for app in $(find "${OVERLAY_PATH}/system/app" -name "*.replace" 2>/dev/null) \
|
|
|
|
for path in ${app_locations}; do
|
|
|
|
$(find "${OVERLAY_PATH}/system/priv-app" -name "*.replace" 2>/dev/null) \
|
|
|
|
for app in $(find "${OVERLAY_PATH}/${path}" -name "*.replace" 2>/dev/null); do
|
|
|
|
$(find "${OVERLAY_PATH}/system/reserve" -name "*.replace" 2>/dev/null) \
|
|
|
|
echo " removing override: $(basename $(dirname ${app}))"
|
|
|
|
$(find "${OVERLAY_PATH}/system/product/app" -name "*.replace" 2>/dev/null) \
|
|
|
|
rm -rf "$(dirname "${app}")"
|
|
|
|
$(find "${OVERLAY_PATH}/system/product/priv-app" -name "*.replace" 2>/dev/null) ; do
|
|
|
|
done
|
|
|
|
echo " removing override: $(basename $(dirname ${app}))"
|
|
|
|
|
|
|
|
rm -rf "$(dirname "${app}")"
|
|
|
|
|
|
|
|
done
|
|
|
|
done
|
|
|
|
else
|
|
|
|
else
|
|
|
|
echo " overrides_clear() does nothing in System Mode!"
|
|
|
|
echo " overrides_clear() does nothing in System Mode!"
|
|
|
@ -201,14 +199,12 @@ overrides_genconfig () {
|
|
|
|
rm -f ${config}
|
|
|
|
rm -f ${config}
|
|
|
|
touch ${config}
|
|
|
|
touch ${config}
|
|
|
|
|
|
|
|
|
|
|
|
for app in $(find "${OVERLAY_PATH}/system/app" -name "*.replace" 2>/dev/null) \
|
|
|
|
for path in ${app_locations}; do
|
|
|
|
$(find "${OVERLAY_PATH}/system/priv-app" -name "*.replace" 2>/dev/null) \
|
|
|
|
for app in $(find "${OVERLAY_PATH}/${path}" -name "*.replace" 2>/dev/null); do
|
|
|
|
$(find "${OVERLAY_PATH}/system/reserve" -name "*.replace" 2>/dev/null) \
|
|
|
|
xapp=$(basename $(dirname ${app}))
|
|
|
|
$(find "${OVERLAY_PATH}/system/product/app" -name "*.replace" 2>/dev/null) \
|
|
|
|
echo " adding ${xapp} to configuration"
|
|
|
|
$(find "${OVERLAY_PATH}/system/product/priv-app" -name "*.replace" 2>/dev/null); do
|
|
|
|
grep -q "^${xapp}$" "${config}" 2>/dev/null || echo "${xapp}" >> "${config}"
|
|
|
|
xapp=$(basename $(dirname ${app}))
|
|
|
|
done
|
|
|
|
echo " adding ${xapp} to configuration"
|
|
|
|
|
|
|
|
grep -q "^${xapp}$" "${config}" 2>/dev/null || echo "${xapp}" >> "${config}"
|
|
|
|
|
|
|
|
done
|
|
|
|
done
|
|
|
|
else
|
|
|
|
else
|
|
|
|
echo " overrides_genconfig() does nothing in System Mode!"
|
|
|
|
echo " overrides_genconfig() does nothing in System Mode!"
|
|
|
@ -226,7 +222,7 @@ ext_storage="/storage/${media_rw}"
|
|
|
|
|
|
|
|
|
|
|
|
get_config .nanodroid-overlay
|
|
|
|
get_config .nanodroid-overlay
|
|
|
|
|
|
|
|
|
|
|
|
app_locations="/system/app /system/priv-app /system/reserve /system/product/app /system/product/priv-app"
|
|
|
|
app_locations="/system/app /system/priv-app /system/reserve /system/product/app /system/product/priv-app /system/system_ext/app /system/system_ext/priv-app"
|
|
|
|
|
|
|
|
|
|
|
|
[[ -f ${config} ]] && export config || config=/data/media/0/.nanodroid-overlay
|
|
|
|
[[ -f ${config} ]] && export config || config=/data/media/0/.nanodroid-overlay
|
|
|
|
|
|
|
|
|
|
|
|