From 2693e89289138dbff780a2a38a2737ab73370ef9 Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Mon, 4 Feb 2019 20:19:40 +0100
Subject: [PATCH] sync CommonAddon

---
 CommonAddon     | 23 ++++++++++++++++-------
 CommonInstaller |  1 -
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/CommonAddon b/CommonAddon
index 960723a..2640a0f 100644
--- a/CommonAddon
+++ b/CommonAddon
@@ -16,8 +16,10 @@ source /tmp/backuptool.functions
 
 MODID=@MODID@
 OUTFD=
-
-GOOGLE_APPS="AMAPNetworkLocation
+print_google_apps()
+{
+cat <<EOF
+AMAPNetworkLocation
 BaiduNetworkLocation
 BlankStore
 ConfigUpdater
@@ -50,13 +52,20 @@ PrebuiltGmsCorePix
 UnifiedNlp
 Velvet
 Vending
-WhisperPush"
+WhisperPush
+EOF
+}
 
-GOOGLE_DATA="com.amap.android.location
+print_google_data ()
+{
+cat <<EOF
+com.amap.android.location
 com.baidu.location
 com.google.android.location
 org.microg.nlp
-org.microg.unifiednlp"
+org.microg.unifiednlp
+EOF
+}
 
 # check for configuration files
 config_locations="/sdcard /external_sd /data"
@@ -191,11 +200,11 @@ postrestore_action () {
 	fi
 
 	ui_print " ++ ${MODID} addon.d: GApps removal"
-	for app in ${GOOGLE_APPS}; do
+	print_google_apps | while read app; do
 		${NANODROID_BINDIR}/nanodroid-overlay --add ${app}
 	done
 
-	for app in ${GOOGLE_DATA}; do
+	print_google_data | while read app; do
 		rm -rf /data/data/${app}
 		rm -rf /data/user/*/${app}
 		rm -rf /data/user_de/*/${app}
diff --git a/CommonInstaller b/CommonInstaller
index 0a7310c..112ada3 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -585,7 +585,6 @@ magisk_install_setup () {
 			MAGISKLOOP=`${MAGISKBIN}/magisk imgtool mount ${IMG} ${MOUNTPATH}`
 			is_mounted ${MOUNTPATH} || error "failed to mount ${IMG}"
 		fi
-
 	else
 		newSizeM=$((reqSizeM / 32 * 32 + 64))
 		${MAGISKBIN}/magisk imgtool create ${IMG} ${newSizeM}