优化代理设置

go-install.sh

@@ -75,11 +75,10 @@ setupEnv(){
 
 setupProxy(){
     ipIsConnect "golang.org"
-    if [[ ! $? -eq 0 ]]; then
-        [[ -z $(grep GO111MODULE ~/.bashrc) ]] && echo "export GO111MODULE=on" >> ~/.bashrc
-        [[ -z $(go env|grep $PROXY_URL) ]] && go env -w GOPROXY=$PROXY_URL,direct
-        colorEcho $GREEN "当前VPS为国内VPS, 成功设置goproxy代理!"
-        source ~/.bashrc
+    if [[ ! $? -eq 0 && `go env|grep proxy.golang.org` ]]; then
+        go env -w GO111MODULE=on
+        go env -w GOPROXY=$PROXY_URL,direct
+        colorEcho $GREEN "当前网络环境为国内环境, 成功设置goproxy代理!"
     fi
 }
 
@@ -107,6 +106,11 @@ installGo(){
         echo "正在获取最新版golang..."
         INSTALL_VERSION=`curl -s https://github.com/golang/go/releases|grep releases/tag|sed '/beta/d'|sed '/rc/d'|grep -o "[0-9].*[0-9]"|head -n 1`
         echo "最新版golang: `colorEcho $BLUE $INSTALL_VERSION`"
+        if [[ `command -v go` ]];then
+            if [[ `go version|awk '{print $3}'|grep -Eo "[0-9.]+"` == $INSTALL_VERSION ]];then
+                return
+            fi
+        fi
     fi
     FILE_NAME="go${INSTALL_VERSION}.$VDIS.tar.gz"
     curl -L https://dl.google.com/go/$FILE_NAME -o $FILE_NAME