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: simplify App Store installation routine

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2018-08-18 21:36:34 +02:00
parent d4f74bd9db
commit 5f4d3798c3
2 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog.md
View File

@ -13,6 +13,7 @@
* 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
* simplify App Store installation routine
* CommonInstaller, SetupWizard
* new value `4` for `nanodroid_play`, will install Yalp Store and Play Store
* new setting `nanodroid_override`, whether to override an existing app

56
CommonInstaller
View File

@ -802,6 +802,9 @@ install_apps () {
}
install_store () {
NANODROID_APP_STORE=""
NANODROID_REM_STORE=""
# install Yalp Store or Play Store whichever requested
case "${nanodroid_play}" in
0 )
@ -810,50 +813,43 @@ 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
NANODROID_APP_STORE="Phonesky"
NANODROID_REM_STORE="FakeStore"
;;
2 )
ui_print " << with Yalp Store"
nanodroid_install_apk YalpStore
NANODROID_APP_STORE="YalpStore"
NANODROID_REM_STORE=""
;;
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
NANODROID_APP_STORE="FakeStore"
NANODROID_REM_STORE="Phonesky"
;;
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
NANODROID_APP_STORE="YalpStore FakeStore"
NANODROID_REM_STORE="Phonesky"
;;
esac
if [ ! -z "${NANODROID_APP_STORE}" ]; then
for app in ${NANODROID_APP_STORE}; do
nanodroid_install_apk ${app}
done
fi
if [ ! -z "${NANODROID_REM_STORE}" ]; then
for app in ${NANODROID_REM_STORE}; do
if [ "${ROM_NO_XBIN}" -eq 1 ]; then
${MODPATH}/system/bin/nanodroid-overlay --add ${app}
else ${MODPATH}/system/xbin/nanodroid-overlay --add ${app}
fi
done
fi
}
install_zelda () {