* SetupWizard

* update for `nanodroid_microg` change
  * move selection of uNlp backend before selection of Play Store
merge-requests/23/head
Christopher Roy Bratusek 6 years ago
parent 4ef6f1a574
commit b92f5bcbed

@ -14,6 +14,10 @@
* 1 = install microG GmsCore, GsfProxy and DroidGuard Helper and Nominatim Geocoder Backend (like before)
* 2 = install microG GmsCore and Nominatim Geocoder Backend (new)
* SetupWizard
* update for `nanodroid_microg` change
* move selection of uNlp backend before selection of Play Store
## 19.1.1.20181103 "Bonaventure Refit"
### Bug Fixes

@ -60,7 +60,6 @@ checkbox(
"setup.prop",
"Adjust the basic settings", "", 2, #-- Group 1
"microG", "Install microG OSS GApps re-implementation", 1,
"F-Droid", "Install F-Droid FOSS App Store", 1,
"Apps", "Install Apps (customized later)", 1,
"Overlay", "Debloat Apps (customized later)", 1,
@ -78,18 +77,15 @@ checkbox(
);
selectbox(
"Google App Store",
"Google App Store",
"microG",
"microG",
"icons/update",
"store.prop",
"Select the Google App Store you want", "", 2, #-- Group 1. key = "selected.1"
"None", "Install no Google App Store", 0, #-- selected.1 = 1
"Play Store", "Install official Play Store", 1, #-- selected.1 = 2
"Yalp Store", "Install unofficial Yalp Store", 0, #-- selected.1 = 3
"Fake Store", "Install Fake Store only", 0, #-- selected.1 = 4
"Yalp + Fake Store", "Install unofficial Yalp Store (+ Fake Store)", 0 #-- selected.1 = 5
"ug.prop",
"Select whether to install microG", "", 2, #-- Group 1. key = "selected.1"
"None", "Don't install microG", 0, #-- selected.1 = 1
"Full", "Install microG [GmsCore, GsfProxy, DroidGuard Helper, Nominatim]", 1, #-- selected.1 = 2
"Minimal", "Install microG [GmsCore, Nominatim]", 0 #-- selected.1 = 3
);
selectbox(
@ -105,6 +101,21 @@ selectbox(
"Both", "Install both backends", 0 #-- selected.1 = 4
);
selectbox(
"Google App Store",
"Google App Store",
"icons/update",
"store.prop",
"Select the Google App Store you want", "", 2, #-- Group 1. key = "selected.1"
"None", "Install no Google App Store", 0, #-- selected.1 = 1
"Play Store", "Install official Play Store", 1, #-- selected.1 = 2
"Yalp Store", "Install unofficial Yalp Store", 0, #-- selected.1 = 3
"Fake Store", "Install Fake Store only", 0, #-- selected.1 = 4
"Yalp + Fake Store", "Install unofficial Yalp Store (+ Fake Store)", 0 #-- selected.1 = 5
);
checkbox(
"App Setup",
"App Setup",

@ -47,6 +47,7 @@ apps_prop="${aromapath}/apps.prop"
debloat_prop="${aromapath}/debloat.prop"
location_prop="${aromapath}/location.prop"
nlp_prop="${aromapath}/nlp.prop"
ug_prop="${aromapath}/ug.prop"
ui_print " "
ui_print "******************************"
@ -82,21 +83,20 @@ done
ui_print " "
ui_print " < Installer Configuration"
setup_add 1 nanodroid_microg
setup_add 2 nanodroid_fdroid
setup_add 3 nanodroid_apps
setup_add 4 nanodroid_overlay
setup_add 5 nanodroid_zelda
setup_add 6 nanodroid_mapsv1
setup_add 7 nanodroid_init
setup_add 8 nanodroid_gsync
setup_add 9 nanodroid_swipe
setup_add 10 nanodroid_forcesystem
setup_add 11 nanodroid_bash
setup_add 12 nanodroid_nano
setup_add 13 nanodroid_utils
setup_add 14 nanodroid_fonts
setup_add 15 nanodroid_override
setup_add 1 nanodroid_fdroid
setup_add 2 nanodroid_apps
setup_add 3 nanodroid_overlay
setup_add 4 nanodroid_zelda
setup_add 5 nanodroid_mapsv1
setup_add 6 nanodroid_init
setup_add 7 nanodroid_gsync
setup_add 8 nanodroid_swipe
setup_add 9 nanodroid_forcesystem
setup_add 10 nanodroid_bash
setup_add 11 nanodroid_nano
setup_add 12 nanodroid_utils
setup_add 13 nanodroid_fonts
setup_add 14 nanodroid_override
if grep -q "selected.1=1" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [None]"
@ -129,6 +129,17 @@ elif grep -q "selected.1=4" "${nlp_prop}"; then
echo "nanodroid_nlpbackend=3" >> "${nanodroid_setup}"
fi
if grep -q "selected.1=1" "${ug_prop}"; then
ui_print " <>> setting property: nanodroid_microg [None]"
echo "nanodroid_microg=0" >> "${nanodroid_setup}"
elif grep -q "selected.1=2" "${ug_prop}"; then
ui_print " <>> setting property: nanodroid_microg [Full]"
echo "nanodroid_microg=1" >> "${nanodroid_setup}"
elif grep -q "selected.1=3" "${ug_prop}"; then
ui_print " <>> setting property: nanodroid_microg [Minimal]"
echo "nanodroid_microg=2" >> "${nanodroid_setup}"
fi
ui_print " "
ui_print " < Installed Applications"

Loading…
Cancel
Save