From 2e61bdcaf676b22c2239532f77891d67ede3346c Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Tue, 10 Apr 2018 21:14:52 +0200
Subject: [PATCH] CommonInstaller: more fixes

---
 CommonInstaller | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/CommonInstaller b/CommonInstaller
index 88c60b3..6407c3a 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -326,7 +326,6 @@ nanodroid_finalize () {
 	ui_print " "
 
 	sync
-
 	nanodroid_storelogs
 
 	if ! ${BOOTMODE} ; then
@@ -1025,7 +1024,7 @@ nanodroid_install_lib () {
 				set_perm_data ${libd}/${lib_arch}/$(basename ${lib})
 
 				[ "${MODE}" = "SYSTEM" ] && \
-					echo /${dir}/${app}/${lib_arch}/$(basename ${lib}) \
+					echo /${dir}/${app}/lib/${lib_arch}/$(basename ${lib}) \
 						>> /data/adb/.nanodroid-list
 			done
 		fi
@@ -1088,18 +1087,26 @@ RESTORE_PATH=${RESTORE_PATH}
 
 cat "${cfg_setup}" >> /data/adb/.nanodroid_${MODID}
 
+if [ ! -z "${cfg_apps}" ]; then
+
 echo "
 ### APPS ###
 " >> /data/adb/.nanodroid_${MODID}
 
 cat "${cfg_apps}" >> /data/adb/.nanodroid_${MODID}
 
+fi
+
+if [ ! -z "${cfg_overlay}" ]; then
+
 echo "
 ### OVERLAY ###
 " >> /data/adb/.nanodroid_${MODID}
 
 cat "${cfg_overlay}" >> /data/adb/.nanodroid_${MODID}
 
+fi
+
 ${BOOTMODE} || cat /tmp/recovery.log > /data/adb/.recovery_${MODID}
 }