From ec31bb9a82c296a643b88499ed476070d21f1cb4 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Sun, 24 Jan 2021 07:18:14 -0800
Subject: [PATCH] Rename scripts

---
 .run/fullApp.run.xml                              | 3 ++-
 app/build.gradle.kts                              | 2 +-
 app/src/main/res/raw/manager.sh                   | 2 +-
 build.py                                          | 2 +-
 scripts/{magisk_uninstaller.sh => uninstaller.sh} | 0
 scripts/update_binary.sh                          | 4 ++--
 6 files changed, 7 insertions(+), 6 deletions(-)
 rename scripts/{magisk_uninstaller.sh => uninstaller.sh} (100%)

diff --git a/.run/fullApp.run.xml b/.run/fullApp.run.xml
index e6d9224df..3d690efa7 100644
--- a/.run/fullApp.run.xml
+++ b/.run/fullApp.run.xml
@@ -7,7 +7,6 @@
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
@@ -16,6 +15,8 @@
     <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
     <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
+    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
+    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
     <option name="DEBUGGER_TYPE" value="Java" />
     <Auto>
       <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 90db744f0..98a0b3e1d 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -114,7 +114,7 @@ val syncAssets by tasks.registering(Sync::class) {
     inputs.property("versionCode", Config.versionCode)
     into("src/main/assets")
     from(rootProject.file("scripts")) {
-        include("util_functions.sh", "boot_patch.sh", "magisk_uninstaller.sh", "addon.d.sh")
+        include("util_functions.sh", "boot_patch.sh", "uninstaller.sh", "addon.d.sh")
     }
     into("chromeos") {
         from(rootProject.file("tools/futility"))
diff --git a/app/src/main/res/raw/manager.sh b/app/src/main/res/raw/manager.sh
index 5c654fb60..4bf5fe311 100644
--- a/app/src/main/res/raw/manager.sh
+++ b/app/src/main/res/raw/manager.sh
@@ -65,7 +65,7 @@ run_uninstaller() {
   rm -rf /dev/tmp
   mkdir -p /dev/tmp/install
   unzip -o "$1" "assets/*" "lib/*" -d /dev/tmp/install
-  INSTALLER=/dev/tmp/install sh /dev/tmp/install/assets/magisk_uninstaller.sh dummy 1 "$1"
+  INSTALLER=/dev/tmp/install sh /dev/tmp/install/assets/uninstaller.sh dummy 1 "$1"
 }
 
 restore_imgs() {
diff --git a/build.py b/build.py
index 47bf9b2bf..974fb99d8 100755
--- a/build.py
+++ b/build.py
@@ -399,7 +399,7 @@ def zip_uninstaller(args):
         zip_with_msg(zipf, source, target)
 
         # updater-script
-        source = op.join('scripts', 'magisk_uninstaller.sh')
+        source = op.join('scripts', 'uninstaller.sh')
         target = op.join('META-INF', 'com', 'google',
                          'android', 'updater-script')
         zip_with_msg(zipf, source, target)
diff --git a/scripts/magisk_uninstaller.sh b/scripts/uninstaller.sh
similarity index 100%
rename from scripts/magisk_uninstaller.sh
rename to scripts/uninstaller.sh
diff --git a/scripts/update_binary.sh b/scripts/update_binary.sh
index 9d297238f..474a85353 100644
--- a/scripts/update_binary.sh
+++ b/scripts/update_binary.sh
@@ -15,8 +15,8 @@ export INSTALLER=$TMPDIR/install
 $BBBIN mkdir -p $INSTALLER
 $BBBIN unzip -o "$3" "assets/*" "lib/*" "META-INF/com/google/*" -x "lib/*/libbusybox.so" -d $INSTALLER >&2
 export ASH_STANDALONE=1
-if [ "${3:-15}" = "uninstaller.zip" ]; then
-  exec $BBBIN sh "$INSTALLER/assets/magisk_uninstaller.sh" "$@"
+if echo "$3" | $BBBIN grep -q "uninstall"; then
+  exec $BBBIN sh "$INSTALLER/assets/uninstaller.sh" "$@"
 else
   exec $BBBIN sh "$INSTALLER/META-INF/com/google/android/updater-script" "$@"
 fi