Browse Source

Fix scripts for F-Droid build

世界 4 years ago
parent
commit
3b81f84cbc

+ 8 - 0
bin/fdroid/install_golang.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+curl -o golang.tar.gz https://storage.googleapis.com/golang/go1.16.linux-amd64.tar.gz
+mkdir "$HOME/.go"
+tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz
+rm golang.tar.gz
+export PATH="$PATH:$HOME/.go/bin"
+go version || exit 1

+ 1 - 7
bin/fdroid/prebuild.sh

@@ -18,13 +18,7 @@ echo "rust.rustcCommand=$HOME/.cargo/bin/rustc" >>local.properties
 echo "rust.cargoCommand=$HOME/.cargo/bin/cargo" >>local.properties
 echo "rust.cargoCommand=$HOME/.cargo/bin/cargo" >>local.properties
 echo "rust.pythonCommand=/usr/bin/python3" >>local.properties
 echo "rust.pythonCommand=/usr/bin/python3" >>local.properties
 
 
-# Install Golang
-curl -o golang.tar.gz https://storage.googleapis.com/golang/go1.16.linux-amd64.tar.gz
-mkdir "$HOME/.go"
-tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz
-rm golang.tar.gz
-export PATH="$PATH:$HOME/.go/bin"
-go version || exit 1
+bin/fdroid/install_golang.sh
 
 
 echo "sdk.dir=$ANDROID_HOME" >>local.properties
 echo "sdk.dir=$ANDROID_HOME" >>local.properties
 echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties
 echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties

+ 5 - 0
bin/fdroid/prebuild_plugin_golang.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+git submodule update --init "plugin/$1"
+
+bin/fdroid/install_golang.sh

+ 3 - 1
buildSrc/src/main/kotlin/Helpers.kt

@@ -182,7 +182,9 @@ fun Project.setupAppCommon() {
             } else {
             } else {
                 signingConfigs.getByName("debug")
                 signingConfigs.getByName("debug")
             }
             }
-            getByName("release").signingConfig = key
+            if (key.name == "debug" && requireTargetAbi().isBlank()) {
+                getByName("release").signingConfig = key
+            }
             getByName("debug").signingConfig = key
             getByName("debug").signingConfig = key
         }
         }
 
 

+ 1 - 34
metadata/description.txt

@@ -1,34 +1 @@
-The application is designed to be used whenever possible.
- 
-Protocols
-
-* SOCKS
-* HTTP(s) / naiveproxy
-* Shadowsocks
-* ShadowsocksR
-* VMess
-* VLESS
-* Trojan
-* VLESS / Trojan + XTLS ( xtls-plugin )
-* Trojan-Go ( trojan-go-plugin )
-
-Subscription protocols
-
-* Universal base64 format
-* Shadowsocks SIP008
-* Clash
-
-Features
-
-* Full basic features
-* V2Ray WebSocket browser forwarding
-* Option to change the notification update interval
-* A Chinese apps scanner (based on dex classpath scanning, so it may be slower)
-* Proxy Chain
-* Advanced routing with outbound profile selection support
-
-Tips
-
-* Click on the title to scroll to the first proxy or the selected proxy
-* Proxy list can be dragged by holding the progress bar
-* The china apps scanner will only scan system apps if "Show system apps" is checked
+The application is designed to be used whenever possible.

+ 8 - 1
run

@@ -2,13 +2,20 @@
 
 
 EXEC=""
 EXEC=""
 TARGET="bin"
 TARGET="bin"
+declare -A PARAMS
+declare -i INDEX=0
+
 for e in $@; do
 for e in $@; do
   TARGET="$TARGET/$e"
   TARGET="$TARGET/$e"
+  PARAMS[$INDEX]=$e
+  INDEX=$INDEX+1
   shift
   shift
   if [ -x "${TARGET}.sh" ]; then
   if [ -x "${TARGET}.sh" ]; then
     EXEC="${TARGET}.sh"
     EXEC="${TARGET}.sh"
+    PARAMS=()
+    INDEX=0
   fi
   fi
 done
 done
 
 
 echo ">> $EXEC"
 echo ">> $EXEC"
-exec "$EXEC" $@
+exec "$EXEC" $PARAMS