From 8a83f5f18bc2c6935c3a2924795df4b1bdc7b93f Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Mon, 7 Oct 2019 22:33:15 +0200 Subject: [PATCH] nanodroid-overlay: /system/product support --- Full/system/xbin/nanodroid-overlay | 55 ++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/Full/system/xbin/nanodroid-overlay b/Full/system/xbin/nanodroid-overlay index d51115f..bdbc77b 100755 --- a/Full/system/xbin/nanodroid-overlay +++ b/Full/system/xbin/nanodroid-overlay @@ -102,6 +102,8 @@ overrides_add () { [ -d /system/app/${app} ] && overrides_add_intern app ${app} [ -d /system/priv-app/${app} ] && overrides_add_intern priv-app ${app} [ -d /system/reserve/${app} ] && overrides_add_intern reserve ${app} + [ -d /system/product/app/${app} ] && overrides_add_intern product/app ${app} + [ -d /system/product/priv-app/${app} ] && overrides_add_intern product/priv-app ${app} done [[ ${SYS_REMOUNT} -eq 1 ]] && mount -oro,remount /system @@ -135,10 +137,14 @@ overrides_remove () { [ -f ${OVERLAY_PATH}/system/app/${app}/.replace ] && overrides_remove_intern app ${app} [ -f ${OVERLAY_PATH}/system/priv-app/${app}/.replace ] && overrides_remove_intern priv-app ${app} [ -f ${OVERLAY_PATH}/system/reserve/${app}/.replace ] && overrides_remove_intern reserve ${app} + [ -f ${OVERLAY_PATH}/system/product/app/${app}/.replace ] && overrides_remove_intern product/app ${app} + [ -f ${OVERLAY_PATH}/system/product/priv-app/${app}/.replace ] && overrides_remove_intern product/priv-app ${app} else [ -d ${STORAGE}/nanodroid_backups/app/${app} ] && overrides_remove_intern app ${app} [ -d ${STORAGE}/nanodroid_backups/priv-app/${app} ] && overrides_remove_intern priv-app ${app} [ -d ${STORAGE}/nanodroid_backups/reserve/${app} ] && overrides_remove_intern reserve ${app} + [ -d ${STORAGE}/nanodroid_backups/product/app/${app} ] && overrides_remove_intern prodcut/app ${app} + [ -d ${STORAGE}/nanodroid_backups/product/priv-app/${app} ] && overrides_remove_intern prodcut/priv-app ${app} fi done @@ -161,6 +167,16 @@ overrides_list () { for app in $(find "${OVERLAY_PATH}/system/reserve" -name "*.replace"); do echo " * $(basename $(dirname "${app}"))" done + + echo "Overrides for /system/product/app:" + for app in $(find "${OVERLAY_PATH}/system/product/app" -name "*.replace"); do + echo " * $(basename $(dirname "${app}"))" + done + + echo "Overrides for /system/product/priv-app:" + for app in $(find "${OVERLAY_PATH}/system/product/priv-app" -name "*.replace"); do + echo " * $(basename $(dirname "${app}"))" + done else echo "Moved-Out apps from /system/app:" for app in $(find "${SYS_BACKUP_PATH}/app" -mindepth 1 -maxdepth 1 -type d); do @@ -176,6 +192,16 @@ overrides_list () { for app in $(find "${SYS_BACKUP_PATH}/reserve" -mindepth 1 -maxdepth 1 -type d); do echo " * $(basename $(dirname "${app}"))" done + + echo "Moved-Out apps from /system/product/app:" + for app in $(find "${SYS_BACKUP_PATH}/product/app" -mindepth 1 -maxdepth 1 -type d); do + echo " * $(basename $(dirname "${app}"))" + done + + echo "Moved-Out apps from /system/product/priv-app:" + for app in $(find "${SYS_BACKUP_PATH}/product/priv-app" -mindepth 1 -maxdepth 1 -type d); do + echo " * $(basename $(dirname "${app}"))" + done fi } @@ -195,6 +221,16 @@ overrides_list_non () { for app in $(find "/system/reserve" -mindepth 1 -maxdepth 1 -type d); do [[ ! -d ${OVERLAY_PATH}/${app} ]] && echo " * $(basename ${app})" done + + echo "non-overriden apps from /system/product/app:" + for app in $(find "/system/product/app" -mindepth 1 -maxdepth 1 -type d); do + [[ ! -d ${OVERLAY_PATH}/${app} ]] && echo " * $(basename ${app})" + done + + echo "non-overriden apps from /system/product/priv-app:" + for app in $(find "/system/product/priv-app" -mindepth 1 -maxdepth 1 -type d); do + [[ ! -d ${OVERLAY_PATH}/${app} ]] && echo " * $(basename ${app})" + done else echo "non-moved-out apps from /system/app:" for app in $(find "/system/app" -mindepth 1 -maxdepth 1 -type d); do @@ -210,6 +246,17 @@ overrides_list_non () { for app in $(find "/system/reserve" -mindepth 1 -maxdepth 1 -type d); do echo " * $(basename ${app})" done + + echo "non-moved-out apps from /system/product/app:" + for app in $(find "/system/product/app" -mindepth 1 -maxdepth 1 -type d); do + echo " * $(basename ${app})" + done + + echo "non-moved-out apps from /system/product/priv-app:" + for app in $(find "/system/product/priv-app" -mindepth 1 -maxdepth 1 -type d); do + echo " * $(basename ${app})" + done + fi } @@ -219,7 +266,9 @@ overrides_clear () { echo " removing Overlays from ${OVERLAY_PATH}" for app in $(find "${OVERLAY_PATH}/system/app" -name "*.replace") \ $(find "${OVERLAY_PATH}/system/priv-app" -name "*.replace") \ - $(find "${OVERLAY_PATH}/system/reserve" -name "*.replace") ; do + $(find "${OVERLAY_PATH}/system/reserve" -name "*.replace") \ + $(find "${OVERLAY_PATH}/system/product/app" -name "*.replace") \ + $(find "${OVERLAY_PATH}/system/product/priv-app" -name "*.replace") ; do echo " removing override: $(basename $(dirname ${app}))" rm -rf "$(dirname "${app}")" done @@ -236,7 +285,9 @@ overrides_genconfig () { for app in $(find "${OVERLAY_PATH}/system/app" -name "*.replace") \ $(find "${OVERLAY_PATH}/system/priv-app" -name "*.replace") \ - $(find "${OVERLAY_PATH}/system/reserve" -name "*.replace") ; do + $(find "${OVERLAY_PATH}/system/reserve" -name "*.replace") \ + $(find "${OVERLAY_PATH}/system/product/app" -name "*.replace") \ + $(find "${OVERLAY_PATH}/system/product/priv-app" -name "*.replace"); do xapp=$(basename $(dirname ${app})) echo " adding ${xapp} to configuration" grep -q "^${xapp}$" "${config}" 2>/dev/null || echo "${xapp}" >> "${config}"