From 0bb7d57f79bc677007098612b4ad30e4b9d4ed8d Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Sun, 19 Aug 2018 18:58:48 +0200
Subject: [PATCH] CommonInstaller: cleanup TWRP environment when an
 installation error occurs during System Mode installation (regression from
 17.9)

---
 ChangeLog.md    | 7 +++++++
 CommonInstaller | 5 ++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 2737315..54ad0ff 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,11 +2,18 @@
 
 ## 17.10 in-dev
 
+### Bug Fixes
+
+* CommonInstaller
+  * cleanup TWRP environment when an installation error occurs during System Mode installation
+     * regression from 17.9
+
 ### General Changes
 
 * CommonInstaller
   * code simplifications
   * don't set progressbar when flashing from Magisk Manager
+  * minor string change
 
 ### Updates
 
diff --git a/CommonInstaller b/CommonInstaller
index 4919589..bae2875 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -155,6 +155,9 @@ show_banner () {
 	ui_print "   NanoDroid ${VERSION}   "
 	ui_print "      created by Nanolx      "
 	case ${MODID} in
+		NanoDroid )
+			ui_print "       Full package          "
+		;;
 		NanoDroid_microG )
 			ui_print "       microG package        "
 		;;
@@ -174,9 +177,9 @@ error () {
 	if [ "${MODE}" = "MAGISK" ]; then
 		rm -rf "${MODPATH}"
 		unmount_magisk_img
-		${BOOTMODE} || recovery_cleanup
 	fi
 
+	${BOOTMODE} || recovery_cleanup
 	nanodroid_storelogs
 
 	exit 1