improve App Store installation routine

merge-requests/23/head
Christopher Roy Bratusek 6 years ago
parent 724948aaa2
commit 97474def22

@ -1,5 +1,16 @@
# ChangeLog
## 17.9 in-dev
### General Changes
* CommonInstaller
* value `2` for `nanodroid_play` will now only install Yalp Store
* value `3` for `nanodroid_play` will now check if Play Store is installed and will get rid of it in favour of Fake Store
* value `1` for `nanodroid_play` will now check if Fake Store is installed and will get rid of it in favour of Play Store
* CommonInstaller, SetupWizard
* new value `4` for `nanodroid_play`, will install Yalp Store and Play Store
## 17.8.20180811
### Bug Fixes

@ -771,17 +771,47 @@ install_store () {
1 )
ui_print " << with Play Store"
nanodroid_install_apk Phonesky
if [ -d /system/priv-app/FakeStore ]; then
echo " + removing conflicting FakeStore"
if [ "${ROM_NO_XBIN}" -eq 1 ]; then
${MODPATH}/system/bin/nanodroid-overlay --add FakeStore
else ${MODPATH}/system/xbin/nanodroid-overlay --add FakeStore
fi
fi
;;
2 )
ui_print " << with Yalp Store (and Fake Store)"
ui_print " << with Yalp Store"
nanodroid_install_apk YalpStore
nanodroid_install_apk FakeStore
;;
3 )
ui_print " << with Fake Store"
nanodroid_install_apk FakeStore
if [ -d /system/priv-app/Phonesky ]; then
echo " + removing conflicting Play Store"
if [ "${ROM_NO_XBIN}" -eq 1 ]; then
${MODPATH}/system/bin/nanodroid-overlay --add Phonesky
else ${MODPATH}/system/xbin/nanodroid-overlay --add Phonesky
fi
fi
;;
4 )
ui_print " << with Yalp Store and Fake Store"
nanodroid_install_apk YalpStore
nanodroid_install_apk FakeStore
if [ -d /system/priv-app/Phonesky ]; then
echo " + removing conflicting Play Store"
if [ "${ROM_NO_XBIN}" -eq 1 ]; then
${MODPATH}/system/bin/nanodroid-overlay --add Phonesky
else ${MODPATH}/system/xbin/nanodroid-overlay --add Phonesky
fi
fi
;;
esac
}

@ -83,10 +83,12 @@ selectbox(
"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 (+ Fake Store)", 0, #-- selected.1 = 3
"Fake Store", "Install Fake Store only", 0 #-- selected.1 = 4
"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
);
selectbox(

@ -109,6 +109,9 @@ elif grep -q "selected.1=3" "${store_prop}"; then
elif grep -q "selected.1=4" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Fake Store]"
echo "nanodroid_play=3" >> "${nanodroid_setup}"
elif grep -q "selected.1=5" "${store_prop}"; then
ui_print " <>> setting property: nanodroid_play [Yalp + Fake Store]"
echo "nanodroid_play=4" >> "${nanodroid_setup}"
fi
if grep -q "selected.1=1" "${nlp_prop}"; then

Loading…
Cancel
Save