From 55b094742ff1ac8b2030d4c619949ccaef5dd48b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@nekox.me>
Date: Mon, 8 Mar 2021 23:05:59 +0800
Subject: [PATCH] Fix build

---
 bin/fdroid/build.sh    | 2 +-
 bin/fdroid/prebuild.sh | 7 ++++---
 bin/init/env.sh        | 4 ++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/bin/fdroid/build.sh b/bin/fdroid/build.sh
index 0dbced11d..7f864c088 100755
--- a/bin/fdroid/build.sh
+++ b/bin/fdroid/build.sh
@@ -8,4 +8,4 @@ bin/init/libs/ffmpeg.sh
 bin/init/libs/boringssl.sh
 
 # Build v2ray-core
-bin/libs/v2ray/build.sh
\ No newline at end of file
+bin/libs/v2ray/build.sh
diff --git a/bin/fdroid/prebuild.sh b/bin/fdroid/prebuild.sh
index a1423b6f1..2bea42eef 100755
--- a/bin/fdroid/prebuild.sh
+++ b/bin/fdroid/prebuild.sh
@@ -14,10 +14,11 @@ 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
-tar -C "/usr/local/lib/go-1.16" --strip-components=1 -xzf golang.tar.gz
+mkdir "$HOME/.go"
+tar -C "$HOME/.go" --strip-components=1 -xzf golang.tar.gz
 rm golang.tar.gz
-export PATH="$PATH:/usr/local/lib/go-1.16/bin"
-go version
+export PATH="$PATH:$HOME/.go/bin"
+go version || exit 1
 
 echo "sdk.dir=$ANDROID_HOME" >>local.properties
 echo "ndk.dir=$ANDROID_NDK_HOME" >>local.properties
diff --git a/bin/init/env.sh b/bin/init/env.sh
index 67f8fd978..b3876a024 100755
--- a/bin/init/env.sh
+++ b/bin/init/env.sh
@@ -23,8 +23,8 @@ export PROJECT=$(realpath .)
 if [ ! $(command -v go) ]; then
   if [ -d /usr/lib/go-1.16 ]; then
     export PATH=$PATH:/usr/lib/go-1.16/bin
-  elif [ -d /usr/local/lib/go-1.16 ]; then
-    export PATH=$PATH:/usr/local/lib/go-1.16/bin
+  elif [ -d $HOME/.go ]; then
+    export PATH=$PATH:$HOME/.go/bin
   fi
 fi