From 259400452cccc369d0b4065eff54e430763208f0 Mon Sep 17 00:00:00 2001
From: Howard20181 <40033067+Howard20181@users.noreply.github.com>
Date: Fri, 26 Aug 2022 03:28:43 +0800
Subject: [PATCH] Add an easy way to skip OpenGApps variant locking

Now all but the pico variant will bootloops.
---
 scripts/run.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/scripts/run.sh b/scripts/run.sh
index f11ea04..0163ff9 100755
--- a/scripts/run.sh
+++ b/scripts/run.sh
@@ -17,7 +17,7 @@
 #
 # Copyright (C) 2022 LSPosed Contributors
 #
-
+# DEBUG=1
 if [ ! "$BASH_VERSION" ] ; then
     echo "Please do not use sh to run this script, just execute it directly" 1>&2
     exit 1
@@ -145,6 +145,8 @@ else
     GAPPS_VARIANT="none"
 fi
 if [ $GAPPS_BRAND = "OpenGApps" ]; then
+    # TODO: Keep it pico since other variants of opengapps are unable to boot successfully
+    if [ "$DEBUG" = "1" ]; then
     GAPPS_VARIANT=$(
         Radiolist '([title]="Variants of GApps"
                      [default]="pico")' \
@@ -159,6 +161,9 @@ if [ $GAPPS_BRAND = "OpenGApps" ]; then
             'tvstock' "" 'off' \
             'tvmini' "" 'off'
     )
+    else
+        GAPPS_VARIANT=pico
+    fi
 else
     GAPPS_VARIANT=$GAPPS_BRAND
 fi
@@ -192,9 +197,7 @@ python3 generateWSALinks.py "$ARCH" "$RELEASE_TYPE" "$DOWNLOAD_DIR" "$DOWNLOAD_C
 python3 generateMagiskLink.py "$MAGISK_VER" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" || abort
 if [ $GAPPS_VARIANT != 'none' ] && [ $GAPPS_VARIANT != '' ]; 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
+        python3 generateGappsLink.py "$ARCH" "$GAPPS_VARIANT" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" || abort
     fi
 fi
 
@@ -635,14 +638,14 @@ 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!"
-    fi
     if [ $GAPPS_BRAND = "OpenGApps" ]; then
         name2="-$GAPPS_BRAND-${GAPPS_VARIANT}"
     else
         name2="-$GAPPS_BRAND"
     fi
+    if [ "$GAPPS_VARIANT" != "pico" ] && [ $GAPPS_BRAND = "OpenGApps" ] && [ "$DEBUG" != "1" ]; then
+        echo ":warning: Since OpenGApps doesn't officially support Android 12.1 yet, lock the variant to pico!"
+    fi
 fi
 artifact_name="WSA${name1}${name2}_${WSA_VER}_${ARCH}_${WSA_REL}"
 echo "$artifact_name"