From 3ba88f9ed0b1e58be01602e1640b7536fb0d1d6c Mon Sep 17 00:00:00 2001
From: FriendlyNeighborhoodShane <shane.880088.supw@gmail.com>
Date: Sat, 31 Dec 2022 18:15:28 +0530
Subject: [PATCH] npem: refactor into get_uid

---
 res/system/bin/npem | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/res/system/bin/npem b/res/system/bin/npem
index 13e3a32..e7453fc 100644
--- a/res/system/bin/npem
+++ b/res/system/bin/npem
@@ -29,9 +29,6 @@ nlpBmap="org.openbmap.unifiedNlp"
 nlpGsm="org.fitchfamily.android.gsmlocation"
 nlpWifi="org.fitchfamily.android.wifi_backend"
 
-# GmsCore userId
-gms_uid=$(dumpsys package com.google.android.gms | awk -F= '/userId/{print $2; exit}')
-
 error () {
 	echo "!! ${@}"
 	exit 1
@@ -68,6 +65,10 @@ permissions () {
 	fi
 }
 
+get_uid () {
+	dumpsys package ${1} | awk -F= '/userId/{print $2; exit}'
+}
+
 get_app_location () {
 	pm list packages -f ${1} | sed 's|package:\(.*\)=[^=]*|\1|g'
 }
@@ -91,6 +92,8 @@ user_install () {
 
 [[ $(whoami) = "root" ]] || [[ $(whoami) = "shell" ]] || error "not running as either ADB or root"
 
+gms_uid=$(get_uid ${microG})
+
 if [ "$(getprop ro.build.version.sdk)" -ge 29 ]; then
 	# microG GmsCore needs to be installed as user app for all permissions to be granted
 	# see https://github.com/microg/android_packages_apps_GmsCore/issues/1100#issuecomment-711088518