From 1d24f74a01973a6ff2219dc6e01c20ad6649d8f4 Mon Sep 17 00:00:00 2001
From: r0fus0d <d2hwakh7bs5e@protonmail.com>
Date: Wed, 29 Nov 2023 16:35:39 +0800
Subject: [PATCH] fix go version (2023/11/29)

---
 f8x            | 10 +++++-----
 f8x_version.sh |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/f8x b/f8x
index 5a5b258f..420a0d7d 100644
--- a/f8x
+++ b/f8x
@@ -32,7 +32,7 @@ Proxy_OK=
 Docker_OK=
 error=0
 Linux_architecture_Name=
-F8x_Version="1.7.0 Dev(2023/11/22)"
+F8x_Version="1.7.0 Dev(2023/11/29)"
 wget_option="-q --show-progress"
 
 # ===================== Software version variable setting (dev) =====================
@@ -41,9 +41,9 @@ Ruby_Ver="3.0"
 Ruby_Dir="ruby-3.0.0"
 Ruby_bin="ruby-3.0.0.tar.gz"
 # https://go.dev/dl/
-Go_Version="go1.20.1"
-Go_Bin_amd64="go1.20.1.linux-amd64.tar.gz"
-Go_Bin_arm64="go1.20.1.linux-arm64.tar.gz"
+Go_Version="go1.21.4"
+Go_Bin_amd64="go1.21.4.linux-amd64.tar.gz"
+Go_Bin_arm64="go1.21.4.linux-arm64.tar.gz"
 # https://nodejs.org/dist/
 node_Ver="v17.4.0"
 node_bin_amd64="node-v17.4.0-linux-x64.tar.xz"
@@ -2652,7 +2652,7 @@ Go_Option(){
 
     if [ $? == 0 ]
     then
-        Go_Version=$(curl -L -s https://golang.org/VERSION?m=text)
+        Go_Version=$(curl -L -s https://golang.org/VERSION?m=text | grep -o 'go[0-9]\+\.[0-9]\+\.[0-9]\+' | awk '{print $1}')
         if test -e /tmp/IS_CI
         then
             input="y"
diff --git a/f8x_version.sh b/f8x_version.sh
index ef28a082..fb530871 100644
--- a/f8x_version.sh
+++ b/f8x_version.sh
@@ -13,9 +13,9 @@ Ruby_Ver="3.0"
 Ruby_Dir="ruby-3.0.0"
 Ruby_bin="ruby-3.0.0.tar.gz"
 # https://go.dev/dl/
-Go_Version="go1.20.1"
-Go_Bin_amd64="go1.20.1.linux-amd64.tar.gz"
-Go_Bin_arm64="go1.20.1.linux-arm64.tar.gz"
+Go_Version="go1.21.4"
+Go_Bin_amd64="go1.21.4.linux-amd64.tar.gz"
+Go_Bin_arm64="go1.21.4.linux-arm64.tar.gz"
 # https://nodejs.org/dist/
 node_Ver="v17.4.0"
 node_bin_amd64="node-v17.4.0-linux-x64.tar.xz"