Better compartmentalisation of variables

conf/defconf-aurora.txt

@@ -86,7 +86,7 @@ stuff_old="
   /system/priv-app/NominatimNLPBackend/NominatimNLPBackend.apk
 ";
 
-stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $initdfile $addondfile";
+stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk";
 
 stuff_debloat="
 ";

conf/defconf-nogoolag.txt

@@ -91,7 +91,7 @@ stuff_old="
 ";
 
 
-stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $stuff_other $stuff_old $initdfile $addondfile";
+stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $stuff_other $stuff_old";
 
 stuff_debloat="
   /system/app/GmsCore/GmsCore.apk

conf/defconf-standard.txt

@@ -90,7 +90,7 @@ stuff_old="
   /system/priv-app/NominatimNLPBackend/NominatimNLPBackend.apk
 ";
 
-stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $stuff_other $stuff_old $initdfile $addondfile";
+stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $stuff_other $stuff_old";
 
 stuff_debloat="
   /system/app/GmsCore/GmsCore.apk

conf/defconf-unlp.txt

@@ -87,7 +87,7 @@ stuff_old="
   /system/priv-app/NominatimNLPBackend/NominatimNLPBackend.apk
 ";
 
-stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $stuff_other $stuff_old $initdfile $addondfile";
+stuff_uninstall="$stuff $stuff_arch $stuff_sdk $stuff_arch_sdk $stuff_other $stuff_old";
 
 stuff_debloat="
   /system/app/GmsCore/GmsCore.apk

src/META-INF/com/google/android/update-binary

@@ -285,7 +285,7 @@ uninstall_pack() {
   if [ "$magisk" = "yes" ]; then
     rm -rf "$root" || { log " "; log "Could not delete Magisk root ($root)"; }
   elif [ "$magisk" = "no" ]; then
-    for thing in $stuff_uninstall; do
+    for thing in $stuff_uninstall $initdfile $addondfile; do
       [ "$thing" ] && uninstall "$root/$thing";
     done;
     uninstall "$initdfile";