2
0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-11-02 03:40:13 +00:00

CommonInstaller: fix error when overriding ROM built-in AdAway / OmniClockOSS if requested

This commit is contained in:
Christopher Roy Bratusek 2018-08-31 20:11:54 +02:00
parent 5e833b6e8e
commit f37bc60073

View File

@ -772,7 +772,7 @@ install_apps () {
ui_print " <<> app: Adaway already provided by ROM (as AdAway)" ui_print " <<> app: Adaway already provided by ROM (as AdAway)"
else nanodroid_install_apk Adaway else nanodroid_install_apk Adaway
echo " + removing conflicting AdAway" echo " + removing conflicting AdAway"
${NANODROID_BINDIR}/nanodroid-overlay --add ${app} ${NANODROID_BINDIR}/nanodroid-overlay --add AdAway
fi fi
elif [[ ${app} = OmniClock && -d /system/app/OmniClockOSS ]]; then elif [[ ${app} = OmniClock && -d /system/app/OmniClockOSS ]]; then
if [ "${nanodroid_override}" -eq 0 ]; then if [ "${nanodroid_override}" -eq 0 ]; then
@ -780,7 +780,7 @@ install_apps () {
else else
nanodroid_install_apk OmniClock nanodroid_install_apk OmniClock
echo " + removing conflicting OmniClockOSS" echo " + removing conflicting OmniClockOSS"
${NANODROID_BINDIR}/nanodroid-overlay --add ${app} ${NANODROID_BINDIR}/nanodroid-overlay --add OmniClockOSS
fi fi
elif [[ -d /system/app/${app} && ! -d ${RESTORE_PATH}/system/app/${app} ]]; then elif [[ -d /system/app/${app} && ! -d ${RESTORE_PATH}/system/app/${app} ]]; then
if [ "${nanodroid_override}" -eq 0 ]; then if [ "${nanodroid_override}" -eq 0 ]; then