|
|
@ -69,24 +69,20 @@ ui_print () {
|
|
|
|
|
|
|
|
|
|
|
|
backup_nlpconflicts () {
|
|
|
|
backup_nlpconflicts () {
|
|
|
|
for app in ${GOOGLE_APPS}; do
|
|
|
|
for app in ${GOOGLE_APPS}; do
|
|
|
|
if [ -d "/system/priv-app/${app}" ]; then
|
|
|
|
if [ -d "/system/priv-app/${app}" -o -d "/system/app/${app}" ]; then
|
|
|
|
mkdir -p /sdcard/nanodroid_backups/priv-app/
|
|
|
|
|
|
|
|
rm -rf /sdcard/nanodroid_backups/priv-app/${app}
|
|
|
|
|
|
|
|
mv /system/priv-app/${app} /sdcard/nanodroid_backups/priv-app/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ui_print " "
|
|
|
|
ui_print " "
|
|
|
|
ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
|
|
|
|
ui_print " ++ Creating overlay for ${app}"
|
|
|
|
ui_print " ++ it conflicts with microG/location backends"
|
|
|
|
ui_print " ++ it conflicts with microG/location backends"
|
|
|
|
ui_print " "
|
|
|
|
ui_print " "
|
|
|
|
elif [ -d "/system/app/${app}" ]; then
|
|
|
|
|
|
|
|
mkdir -p /sdcard/nanodroid_backups/app/
|
|
|
|
|
|
|
|
rm -rf /sdcard/nanodroid_backups/app/${app}
|
|
|
|
|
|
|
|
mv /system/app/${app} /sdcard/nanodroid_backups/app/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ui_print " "
|
|
|
|
if ! grep -q "^${app}" ${cfg_overlay}; then
|
|
|
|
ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
|
|
|
|
echo ${app} >> ${cfg_overlay}
|
|
|
|
ui_print " ++ it conflicts with microG/location backends"
|
|
|
|
fi
|
|
|
|
ui_print " "
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if [ "${ROM_NO_XBIN}" -eq 1 ]; then
|
|
|
|
|
|
|
|
system/bin/nanodroid-overlay --add ${app}
|
|
|
|
|
|
|
|
else system/xbin/nanodroid-overlay --add ${app}
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
done
|
|
|
|
done
|
|
|
|
}
|
|
|
|
}
|
|
|
|