From 89f23006de51a9eda68f84cd8011d4fcf2c0448c Mon Sep 17 00:00:00 2001
From: Syuugo <pub@s1204.me>
Date: Thu, 25 Aug 2022 03:16:13 +0900
Subject: [PATCH 1/2] Fixed some text

OpenG "A "pps, etc.
---
 scripts/run.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index 82a5f93..0a1aa83 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -117,24 +117,24 @@ MAGISK_VER=$(
         'debug' "Canary Channel Debug Build" 'off'
 )
 
-if (YesNoBox '([title]="Install Gapps" [text]="Do you want to install gapps?")'); then
+if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")'); then
     if [ -f "$DOWNLOAD_DIR"/MindTheGapps/MindTheGapps_"$ARCH".zip ]; then
         GAPPS_BRAND=$(
-            Radiolist '([title]="Which gapps do you want to install?"
+            Radiolist '([title]="Which GApps do you want to install?"
                      [default]="OpenGapps")' \
                 \
-                'OpenGapps' "" 'on' \
+                'OpenGApps' "" 'on' \
                 'MindTheGapps' "" 'off'
         )
     else
-        GAPPS_BRAND="OpenGapps"
+        GAPPS_BRAND="OpenGApps"
     fi
 else
     GAPPS_VARIANT="none"
 fi
-if [ $GAPPS_BRAND = "OpenGapps" ]; then
+if [ $GAPPS_BRAND = "OpenGApps" ]; then
     GAPPS_VARIANT=$(
-        Radiolist '([title]="Variants of gapps"
+        Radiolist '([title]="Variants of GApps"
                      [default]="pico")' \
             \
             'super' "" 'off' \
@@ -151,7 +151,7 @@ else
     GAPPS_VARIANT=$GAPPS_BRAND
 fi
 
-if (YesNoBox '([title]="Remove Amazon AppStore" [text]="Do you want to keep amazon appStore?")'); then
+if (YesNoBox '([title]="Remove Amazon AppStore" [text]="Do you want to keep Amazon AppStore?")'); then
     REMOVE_AMAZON="keep"
 else
     REMOVE_AMAZON="remove"
@@ -207,7 +207,7 @@ echo -e "done\n"
 if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then
     echo "Extract GApps"
     mkdir -p "$WORK_DIR"/gapps || abort
-    if [ $GAPPS_BRAND = "OpenGapps" ]; then
+    if [ $GAPPS_BRAND = "OpenGApps" ]; then
         unzip -p "$DOWNLOAD_DIR"/gapps.zip {Core,GApps}/'*.lz' | tar --lzip -C "$WORK_DIR"/gapps -xf - -i --strip-components=2 --exclude='setupwizardtablet-x86_64' --exclude='packageinstallergoogle-all' --exclude='speech-common' --exclude='markup-lib-arm' --exclude='markup-lib-arm64' --exclude='markup-all' --exclude='setupwizarddefault-x86_64' --exclude='pixellauncher-all' --exclude='pixellauncher-common' || abort
     else
         unzip "$DOWNLOAD_DIR"/MindTheGapps/MindTheGapps_"$ARCH".zip "system/*" -x "system/addon.d/*" "system/system_ext/priv-app/SetupWizard/*" -d "$WORK_DIR"/gapps || abort
@@ -432,7 +432,7 @@ if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then
     sudo find "$MOUNT_DIR"/system/{app,framework,priv-app} -type f -exec chcon --reference="$MOUNT_DIR"/system/framework/ext.jar {} \;
     sudo find "$MOUNT_DIR"/product/{app,etc,overlay,priv-app,lib64,lib,framework} -type f -exec chcon --reference="$MOUNT_DIR"/product/etc/permissions/com.android.settings.intelligence.xml {} \;
 
-    if [ $GAPPS_BRAND = "OpenGapps" ]; then
+    if [ $GAPPS_BRAND = "OpenGApps" ]; then
         ls "$WORK_DIR"/gapps/etc/ | xargs -n 1 -I dir sudo find "$MOUNT_DIR"/system/etc/dir -type f -exec chmod 0644 {} \;
         ls "$WORK_DIR"/gapps/etc/ | xargs -n 1 -I dir sudo find "$MOUNT_DIR"/system/etc/dir -type d -exec chcon --reference="$MOUNT_DIR"/system/etc/permissions {} \;
         ls "$WORK_DIR"/gapps/etc/ | xargs -n 1 -I dir sudo find "$MOUNT_DIR"/system/etc/dir -type f -exec chcon --reference="$MOUNT_DIR"/system/etc/permissions {} \;

From 08638400bdbd244f3040b31c4c66f98fbbe2d2ba Mon Sep 17 00:00:00 2001
From: Howard20181 <40033067+Howard20181@users.noreply.github.com>
Date: Thu, 25 Aug 2022 02:32:55 +0800
Subject: [PATCH 2/2] Fix some missing strings

---
 scripts/run.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index 0a1aa83..8588dde 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -121,7 +121,7 @@ if (YesNoBox '([title]="Install GApps" [text]="Do you want to install GApps?")')
     if [ -f "$DOWNLOAD_DIR"/MindTheGapps/MindTheGapps_"$ARCH".zip ]; then
         GAPPS_BRAND=$(
             Radiolist '([title]="Which GApps do you want to install?"
-                     [default]="OpenGapps")' \
+                     [default]="OpenGApps")' \
                 \
                 'OpenGApps' "" 'on' \
                 'MindTheGapps' "" 'off'
@@ -178,7 +178,7 @@ echo "Generate Download Links"
 python3 generateWSALinks.py "$ARCH" "$RELEASE_TYPE" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" || abort
 python3 generateMagiskLink.py "$MAGISK_VER" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" || abort
 if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; then
-    if [ $GAPPS_BRAND = "OpenGapps" ]; then
+    if [ $GAPPS_BRAND = "OpenGApps" ]; then
         # TODO: Keep it pico since other variants of opengapps are unable to boot successfully
         python3 generateGappsLink.py "$ARCH" "pico" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" || abort
         # python3 generateGappsLink.py "$ARCH" "$GAPPS_VARIANT" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" || abort
@@ -587,8 +587,8 @@ fi
 if [[ "$GAPPS_VARIANT" = "none" || "$GAPPS_VARIANT" = "" ]]; then
     name2="-NoGApps"
 else
-    if [ "$GAPPS_VARIANT" != "pico" ] && [ $GAPPS_BRAND = "OpenGapps" ]; then
-        echo ":warning: Since OpenGapps doesn't officially support Android 12.1 yet, lock the variant to pico!"
+    if [ "$GAPPS_VARIANT" != "pico" ] && [ $GAPPS_BRAND = "OpenGApps" ]; then
+        echo ":warning: Since OpenGApps doesn't officially support Android 12.1 yet, lock the variant to pico!"
     fi
     name2="-GApps-${GAPPS_VARIANT}"
 fi