From 1924b72034648e193a0dcb64d9ec5bf646c6e18a Mon Sep 17 00:00:00 2001
From: Christopher Roy Bratusek <nano@jpberlin.de>
Date: Fri, 26 Jul 2019 16:27:26 +0200
Subject: [PATCH] CommonInstaller: also get rid of wrong overlays introduced by
 version 22.0

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

diff --git a/ChangeLog.md b/ChangeLog.md
index a26fc53..76ac502 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -2,10 +2,21 @@
 
 ## 23.0 in-dev
 
+### Bugfixes
+
+* Installer
+  * fix microG installation in System Mode
+
+### General Changes
+
+* Installer
+  * include path to setup files in installation log
+
 ### Updates
 
 * automatic
   * OsmAnd+ (3.4.4)
+  * Privacy Browser (3.2)
   * Simple Gallery (6.8.3)
   * Twidere (3.7.6)
 
diff --git a/CommonInstaller b/CommonInstaller
index 10fe6ee..5234ddb 100644
--- a/CommonInstaller
+++ b/CommonInstaller
@@ -1672,7 +1672,10 @@ check_cfg_apps () {
 
 # check whether '.nanodroid-overlay' is up to date
 check_cfg_overlay () {
-	return 0
+	# 22.0 flagged the following for overlay creation which caused issues
+	grep -q "^GmsCore$" "${cfg_overlay}" && sed '/^GmsCore$/d' -i "${cfg_overlay}"
+	grep -q "^GsfProxy$" "${cfg_overlay}" && sed '/^GsfProxy$/d' -i "${cfg_overlay}"
+	grep -q "^DroidGuard$" "${cfg_overlay}" && sed '/^DroidGuard$/d' -i "${cfg_overlay}"
 }
 
 get_cfg_setup () {