Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-11-17 21:26:22 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Compatibility with /sdcard1 external SD mount path for some non TWRP recoveries

See merge request Nanolx/NanoDroid!21
This commit is contained in:
Christopher Roy Bratusek 2019-06-30 14:32:22 +00:00
commit 3206ce1fa2
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CommonAddon
View File

@ -62,7 +62,7 @@ EOF
} }
# check for configuration files # check for configuration files
config_locations="/data/media/0 /external_sd /data" config_locations="/data/media/0 /external_sd /sdcard1 /data"
get_config () { get_config () {
config="" config=""

4
CommonInstaller
View File

@ -1418,7 +1418,7 @@ nanodroid_substitute () {
[ ! -f "${target}" ] && error "file: ${file} not found" [ ! -f "${target}" ] && error "file: ${file} not found"
if grep -q @ZIPDIR@ "${target}"; then if grep -q @ZIPDIR@ "${target}"; then
if [[ "${ZIPDIR}" == "/external_sd" ]]; then if [[ "${ZIPDIR}" == "/external_sd" ]] || [[ "${ZIPDIR}" == "/sdcard1" ]]; then
# /external_sd is already known by `nanodroid-overlay` # /external_sd is already known by `nanodroid-overlay`
# no need to add it a second time # no need to add it a second time
sed -e 's|@ZIPDIR@||' -i ${target} sed -e 's|@ZIPDIR@||' -i ${target}
@ -1528,7 +1528,7 @@ ui_print " "
########################################################################################## ##########################################################################################
# check for configuration files # check for configuration files
config_locations="${STORAGE} /external_sd ${ZIPDIR} /data" config_locations="${STORAGE} /external_sd /sdcard1 ${ZIPDIR} /data"
get_config () { get_config () {
config="" config=""

2
Full/system/xbin/nanodroid-overlay
View File

@ -247,7 +247,7 @@ overrides_genconfig () {
} }
# check for configuration files # check for configuration files
config_locations="/data/media/0 /external_sd /data @ZIPDIR@ /dev/tmp/install" config_locations="/data/media/0 /external_sd /sdcard1 /data @ZIPDIR@ /dev/tmp/install"
get_config .nanodroid-overlay get_config .nanodroid-overlay
[[ -f ${config} ]] && export config || config=${STORAGE}/.nanodroid-overlay [[ -f ${config} ]] && export config || config=${STORAGE}/.nanodroid-overlay

3
setup-wizard/nanodroid-setup
View File

@ -74,6 +74,9 @@ elif grep -q "selected.1=2" "${location_prop}"; then
if -d /external_sd; then if -d /external_sd; then
ui_print " > saving configuration in: /external_sd" ui_print " > saving configuration in: /external_sd"
configpath="/external_sd" configpath="/external_sd"
elif -d /sdcard1; then
ui_print " > saving configuration in: /sdcard1"
configpath="/sdcard1"
else else
ui_print " > saving configuration in: /data/media/0" ui_print " > saving configuration in: /data/media/0"
configpath="/data/media/0" configpath="/data/media/0"

2
uninstaller/META-INF/com/google/android/update-binary
View File

@ -161,7 +161,7 @@ mount_partitions () {
} }
# check for configuration files # check for configuration files
config_locations="/data/media/0 /external_sd /data $(dirname ${ZIP}))" config_locations="/data/media/0 /external_sd /sdcard1 /data $(dirname ${ZIP}))"
config_files=".nanodroid-setup .nanodroid-apps .nanodroid-overlay" config_files=".nanodroid-setup .nanodroid-apps .nanodroid-overlay"
restore_apps () { restore_apps () {