Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-10-31 09:20:23 +00:00
Code Issues Projects Releases Wiki Activity

CommonAddon: re-remove conflicting GApps after OTA update

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2018-04-13 20:05:37 +02:00
parent 49ca491871
commit 9605dd0629
2 changed files with 73 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@ -22,6 +22,7 @@
* System Mode * System Mode
* Addon for OTA survival * Addon for OTA survival
* restore NanoDroid-Font settings after OTA update * restore NanoDroid-Font settings after OTA update
* re-remove conflicting GApps after OTA update
* shares file list with Uninstaller * shares file list with Uninstaller
* Full package * Full package
* switch to QKSMS 3 * switch to QKSMS 3

72
CommonAddon
View File

@ -14,11 +14,81 @@
MODID=@MODID@ MODID=@MODID@
OUTFD=$(ps | grep -v grep | grep -oE "update(.*)" | cut -d" " -f3) OUTFD=$(ps | grep -v grep | grep -oE "update(.*)" | cut -d" " -f3)
GOOGLE_APPS="GoogleFeedback
GoogleLoginService
GoogleOneTimeInitializer
GoogleServicesFramework
MarketUpdater
PlayGames
Velvet
GmsDroidGuard
YouTube
GmsCore_update
GmsCoreSetupPrebuilt
PrebuiltGmsCore
WhisperPush
BlankStore
FDroidPriv
PlayStore
Vending
AMAPNetworkLocation
BaiduNetworkLocation
LegacyNetworkLocation
NetworkLocation
UnifiedNlp
DejaVuBackend
DejaVuNlpBackend
IchnaeaNlpBackend
MozillaNlpBackend
NominatimGeocoderBackend
NominatimNlpBackend
com.mgoogle.android.gms
com.google.android.gms
com.google.android.feedback
com.google.android.gsf.login
com.google.android.gsf
com.android.vending
org.microg.gms.droidguard
org.schabi.newpipe
com.google.android.youtube
com.qualcomm.location
com.amap.android.location
com.baidu.location
com.google.android.location
org.microg.nlp
org.microg.unifiednlp
com.google.android.maps
org.fitchfamily.android.dejavu
org.microg.nlp.backend.ichnaea
org.microg.nlp.backend.nominatim"
ui_print () { ui_print () {
echo -n -e "ui_print ${1}\n" >> /proc/self/fd/${OUTFD} echo -n -e "ui_print ${1}\n" >> /proc/self/fd/${OUTFD}
echo -n -e "ui_print\n" >> /proc/self/fd/${OUTFD} echo -n -e "ui_print\n" >> /proc/self/fd/${OUTFD}
} }
backup_nlpconflicts () {
for app in ${GOOGLE_APPS}; do
if [ -d "/system/priv-app/${app}" ]; then
mkdir -p /sdcard/nanodroid_backups/priv-app/
mv /system/priv-app/${app} /sdcard/nanodroid_backups/priv-app/
ui_print " "
ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
ui_print " ++ it conflicts with microG/location backends"
ui_print " "
elif [ -d "/system/app/${app}" ]; then
mkdir -p /sdcard/nanodroid_backups/app/
mv /system/app/${app} /sdcard/nanodroid_backups/app/
ui_print " "
ui_print " ++ Moving ${app} to /sdcard/nanodroid_backups/"
ui_print " ++ it conflicts with microG/location backends"
ui_print " "
fi
done
}
case "${1}" in case "${1}" in
backup) backup)
if [ -r /data/adb/.nanodroid-list ]; then if [ -r /data/adb/.nanodroid-list ]; then
@ -71,6 +141,8 @@ case "${1}" in
rm /tmp/nanodroid_font rm /tmp/nanodroid_font
fi fi
backup_nlpconflicts
;; ;;
esac esac