From 62cfba5eef20cda7f078a8adfe9834bd3bd77e97 Mon Sep 17 00:00:00 2001
From: nift4 <nift4@protonmail.com>
Date: Fri, 6 Sep 2024 19:21:39 +0200
Subject: [PATCH] microG Installer Revived 4.0.2-0

---
 customize.sh | 14 ++++++++++----
 module.prop  |  4 ++--
 update.json  |  8 ++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/customize.sh b/customize.sh
index 231ce99..32b36e8 100644
--- a/customize.sh
+++ b/customize.sh
@@ -22,13 +22,16 @@ fi
 mmm_exec showLoading
 ui_print "Collecting information about com.google.android.gms"
 # check microG
-DUMP_GMS="$(pm dump-package com.google.android.gms)"
+DUMP_GMS="$(pm dump com.google.android.gms)"
+if [[ $? -gt 0 ]]; then
+    ui_print "- WARNING: pm dump may have failed?"
+fi
 ui_print "Checking if com.google.android.gms is installed"
 if (echo "$DUMP_GMS" | grep "Unable to find package: com.google.android.gms") >/dev/null; then
     abort "- ERROR: You do not have official microG installed."
 fi
 ui_print "Collecting file path of com.google.android.gms"
-GMS_PATH="$(realpath $(echo "$DUMP_GMS" | grep path: | cut -d: -f2))"
+GMS_PATH="$(realpath $(echo "$DUMP_GMS" | grep path: | head -n1 | cut -d: -f2))"
 ui_print "Checking if file path of com.google.android.gms is on /data"
 if [[ "$GMS_PATH" = "${GMS_PATH#/data/}" ]]; then
     abort "- ERROR: expected microG install path to be on /data, but it's $GMS_PATH"
@@ -49,13 +52,16 @@ if [[ "$GMS_VER" -gt "$MAX_VER" ]]; then
 fi
 # check Vending
 ui_print "Collecting information about com.android.vending"
-DUMP_VD="$(pm dump-package com.android.vending)"
+DUMP_VD="$(pm dump com.android.vending)"
+if [[ $? -gt 0 ]]; then
+    ui_print "- WARNING: pm dump may have failed?"
+fi
 ui_print "Checking if com.android.vending is installed"
 if (echo "$DUMP_VD" | grep "Unable to find package: com.android.vending") >/dev/null; then
     abort "- ERROR: You do not have microG Companion or Play Store installed."
 fi
 ui_print "Collecting file path of com.android.vending"
-VD_PATH="$(realpath $(echo "$DUMP_VD" | grep path: | cut -d: -f2))"
+VD_PATH="$(realpath $(echo "$DUMP_VD" | grep path: | head -n1 | cut -d: -f2))"
 ui_print "Checking if file path of com.android.vending is on /data"
 if [[ "$VD_PATH" = "${VD_PATH#/data/}" ]]; then
     abort "- ERROR: expected microG Companion / Play Store install path to be on /data, but it's $VD_PATH"
diff --git a/module.prop b/module.prop
index 395f73c..56bbb19 100644
--- a/module.prop
+++ b/module.prop
@@ -1,7 +1,7 @@
 id=microg_installer
 name=microG Installer Revived
-version=Revived 4.0.1-0
-versionCode=40010
+version=Revived 4.0.2-0
+versionCode=40020
 author=nift4
 description=Install microG GmsCore, Companion (or Play Store if you want so), GsfProxy and MapsV1 to /system/
 updateJson=https://raw.github.com/nift4/microg_installer_revived/master/update.json
diff --git a/update.json b/update.json
index 8227ce1..85b3e98 100644
--- a/update.json
+++ b/update.json
@@ -1,6 +1,6 @@
 {
-    "version": "Revived 4.0.1-0",
-    "versionCode": 40010,
-    "zipUrl": "https://github.com/nift4/microg_installer_revived/releases/download/v4.0.1-0/microG_Installer_Revived.zip",
-    "changelog": "https://github.com/nift4/microg_installer_revived/raw/v4.0.1-0/CHANGELOG"
+    "version": "Revived 4.0.2-0",
+    "versionCode": 40020,
+    "zipUrl": "https://github.com/nift4/microg_installer_revived/releases/download/v4.0.2-0/microG_Installer_Revived.zip",
+    "changelog": "https://github.com/nift4/microg_installer_revived/raw/v4.0.2-0/CHANGELOG"
 }