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

CommonInstaller: more fine-graded microG installation

Browse Source 
nanodroid_microg=[0|1|2]:
* 0 = don't install microG at all (like before)
* 1 = install microG GmsCore, GsfProxy and DroidGuard Helper and Nominatim Geocoder Backend (like before)
* 2 = install microG GmsCore and Nominatim Geocoder Backend (new)
This commit is contained in:
Christopher Roy Bratusek 2018-11-07 17:25:25 +01:00
parent 55675bf805
commit e45a9860a8
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog.md
View File

@ -8,6 +8,12 @@
* drop YouTube from list of applications to get rid as part of GApps removal
* improve and unify GSync installation code
* Full, microG packages
* `nanodroid_microg` setting is now a triplette
* 0 = don't install microG at all (like before)
* 1 = install microG GmsCore, GsfProxy and DroidGuard Helper and Nominatim Geocoder Backend (like before)
* 2 = install microG GmsCore and Nominatim Geocoder Backend (new)
## 19.1.1.20181103 "Bonaventure Refit"
### Bug Fixes

18
CommonInstaller
View File

@ -638,7 +638,7 @@ magisk_install_finish () {
install_microg () {
# install microG if requested
# respectively force if it's the microG package
if [ "${nanodroid_microg}" -eq 1 -o "${MODID}" = "NanoDroid_microG" ]; then
if [ "${nanodroid_microg}" -ne 0 -o "${MODID}" = "NanoDroid_microG" ]; then
# first get rid of conflicting packages
for app in ${GOOGLE_APPS}; do
@ -696,15 +696,21 @@ install_microg () {
ui_print " << with microG [Déjà Vu, Ichnaea, Nominatim]" ;;
esac
for app in ${NLPBACKEND} nlpBackendNominatim GmsCore GsfProxy DroidGuard; do
for app in ${NLPBACKEND} nlpBackendNominatim GmsCore; do
nanodroid_install_apk ${app}
done
if [ -z "$(find /data/app -type d -name 'org.microg.gms.droidguard*')" ]; then
cp -r "${INSTALLER}/system/priv-app/DroidGuard/" \
/data/app/org.microg.gms.droidguard-1
if [ "${nanodroid_microg}" -ne 2 ]; then
for app in GsfProxy DroidGuard; do
nanodroid_install_apk ${app}
done
set_perm_recursive /data/app/org.microg.gms.droidguard-1 1000 1000 0755 0644
if [ -z "$(find /data/app -type d -name 'org.microg.gms.droidguard*')" ]; then
cp -r "${INSTALLER}/system/priv-app/DroidGuard/" \
/data/app/org.microg.gms.droidguard-1
set_perm_recursive /data/app/org.microg.gms.droidguard-1 1000 1000 0755 0644
fi
fi
nanodroid_install_file etc/permissions/features.xml

6
doc/AlterInstallation.md
View File

@ -59,10 +59,14 @@ Alternatively you can also use the NanoDroid-SetupWizard package instead of manu
## Detailed Description
`nanodroid_microg=[0|1]`
`nanodroid_microg=[0|1|2]`
whether to provide **microG**
* 0 = don't install microG at all
* 1 = install microG GmsCore, GsfProxy and DroidGuard Helper and Nominatim Geocoder Backend
* 2 = install microG GmsCore and Nominatim Geocoder Backend only
`nanodroid_fdroid=[0|1]`
whether to provide **F-Droid**