Archives/NanoDroid
2
0
Fork 0
mirror of https://gitlab.com/Nanolx/NanoDroid synced 2024-11-16 00:12:46 +00:00
Code Issues Projects Releases Wiki Activity

CommonInstaller: ensure our custom Busybox is always used during installation [+ additional logging]

Browse Source
This commit is contained in:
Christopher Roy Bratusek 2019-04-25 20:18:41 +02:00
parent 15c2d6c8a5
commit cb1d1ddb05
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CommonInstaller
View File

@ -505,6 +505,9 @@ setup_busybox () {
chmod 0755 ${INSTALLER}/sqlite3.${BIN_ARCH} chmod 0755 ${INSTALLER}/sqlite3.${BIN_ARCH}
# XXX Magisk recovery_actions() compat
export BBDIR="${INSTALLER}/busybox"
export PATH="${INSTALLER}/busybox:${PATH}" export PATH="${INSTALLER}/busybox:${PATH}"
} }
@ -1254,6 +1257,8 @@ nanodroid_install_apk () {
mkdir -p "${dest}" mkdir -p "${dest}"
echo " installing app: ${app}" echo " installing app: ${app}"
echo " from: ${source}"
echo " into: ${dest} [${dest_apk}]"
cp "${source}" "${dest}/${dest_apk}" || \ cp "${source}" "${dest}/${dest_apk}" || \
error "failed to install ${source} to ${dest}" error "failed to install ${source} to ${dest}"
@ -1327,7 +1332,7 @@ nanodroid_install_lib () {
case ${unzip_return} in case ${unzip_return} in
0 ) echo " ${app} does have libs" ;; 0 ) echo " ${app} does have libs" ;;
11 ) echo " ${app} does not have any libs" ;; 11 ) echo " ${app} does not have any libs" ;;
* ) error " !! installing libs for ${app} failed" ;; * ) error " !! installing libs for ${app} failed [${unzip_return}]" ;;
esac esac
if [ -d ${TMP_LIBDIR}/lib ]; then if [ -d ${TMP_LIBDIR}/lib ]; then