From 79b41478ac7290453b73bf00c4cdcd84e588f051 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Tue, 16 Nov 2021 18:03:34 +0100
Subject: [fix] filtron & morty - install golang binary that fits to arch & os

Closes: https://github.com/searxng/searxng/issues/507
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/filtron.sh | 26 ++++++--------------------
 utils/lib.sh     | 35 -----------------------------------
 utils/morty.sh   | 26 ++++++--------------------
 3 files changed, 12 insertions(+), 75 deletions(-)

(limited to 'utils')

diff --git a/utils/filtron.sh b/utils/filtron.sh
index 4e8d6aa5d..ff380a327 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -4,6 +4,8 @@
 
 # shellcheck source=utils/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
+# shellcheck source=utils/lib_go.sh
+source "${REPO_ROOT}/utils/lib_go.sh"
 # shellcheck source=utils/lib_install.sh
 source "${REPO_ROOT}/utils/lib_install.sh"
 
@@ -43,8 +45,6 @@ SERVICE_GROUP="${SERVICE_USER}"
 
 GO_ENV="${SERVICE_HOME}/.go_env"
 GO_VERSION="go1.17.2"
-GO_PKG_URL="https://golang.org/dl/${GO_VERSION}.linux-amd64.tar.gz"
-GO_TAR=$(basename "$GO_PKG_URL")
 
 APACHE_FILTRON_SITE="searxng.conf"
 NGINX_FILTRON_SITE="searxng.conf"
@@ -218,7 +218,7 @@ install_all() {
     rst_title "Install $SERVICE_NAME (service)"
     assert_user
     wait_key
-    install_go "${GO_PKG_URL}" "${GO_TAR}" "${SERVICE_USER}"
+    go.golang "${GO_VERSION}" "${SERVICE_USER}"
     wait_key
     install_filtron
     install_rules
@@ -301,9 +301,7 @@ install_check() {
 }
 
 go_version(){
-    sudo -i -u "$SERVICE_USER" <<EOF
-go version | cut -d' ' -f 3
-EOF
+    go.version "${SERVICE_USER}"
 }
 
 remove_all() {
@@ -338,12 +336,6 @@ EOF
     export SERVICE_HOME
     echo "export SERVICE_HOME=$SERVICE_HOME"
 
-    cat > "$GO_ENV" <<EOF
-export GOPATH=\$HOME/go-apps
-export PATH=\$HOME/local/go/bin:\$GOPATH/bin:\$PATH
-EOF
-    echo "Environment $GO_ENV has been setup."
-
     tee_stderr <<EOF | sudo -i -u "$SERVICE_USER"
 grep -qFs -- 'source $GO_ENV' ~/.profile || echo 'source $GO_ENV' >> ~/.profile
 EOF
@@ -353,22 +345,16 @@ filtron_is_installed() {
     [[ -f $SERVICE_HOME/go-apps/bin/filtron ]]
 }
 
-_svcpr="  ${_Yellow}|${SERVICE_USER}|${_creset} "
-
 install_filtron() {
     rst_title "Install filtron in user's ~/go-apps" section
     echo
-    tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr"
-go install -v github.com/asciimoo/filtron@latest
-EOF
+    go.install github.com/asciimoo/filtron@latest "${SERVICE_USER}"
 }
 
 update_filtron() {
     rst_title "Update filtron" section
     echo
-    tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr"
-go install -v github.com/asciimoo/filtron@latest
-EOF
+    go.install github.com/asciimoo/filtron@latest "${SERVICE_USER}"
 }
 
 install_rules() {
diff --git a/utils/lib.sh b/utils/lib.sh
index 7f6ff58c4..4472b9d32 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -504,7 +504,6 @@ install_template() {
     done
 }
 
-
 service_is_available() {
 
     # usage:  service_is_available <URL>
@@ -825,40 +824,6 @@ EOF
     build_msg GH-PAGES "deployed"
 }
 
-# golang
-# ------
-
-go_is_available() {
-
-    # usage:  go_is_available $SERVICE_USER && echo "go is installed!"
-
-    sudo -i -u "${1}" which go &>/dev/null
-}
-
-install_go() {
-
-    # usage:  install_go "${GO_PKG_URL}" "${GO_TAR}" "${SERVICE_USER}"
-
-    local _svcpr="  ${_Yellow}|${3}|${_creset} "
-
-    rst_title "Install Go in user's HOME" section
-
-    rst_para "download and install go binary .."
-    cache_download "${1}" "${2}"
-
-    tee_stderr 0.1 <<EOF | sudo -i -u "${3}" | prefix_stdout "$_svcpr"
-echo \$PATH
-echo \$GOPATH
-mkdir -p \$HOME/local
-rm -rf \$HOME/local/go
-tar -C \$HOME/local -xzf ${CACHE}/${2}
-EOF
-    sudo -i -u "${3}" <<EOF | prefix_stdout
-! which go >/dev/null &&  echo "ERROR - Go Installation not found in PATH!?!"
-which go >/dev/null &&  go version && echo "congratulations -- Go installation OK :)"
-EOF
-}
-
 # system accounts
 # ---------------
 
diff --git a/utils/morty.sh b/utils/morty.sh
index c04df7a0c..c1f2bc968 100755
--- a/utils/morty.sh
+++ b/utils/morty.sh
@@ -3,6 +3,8 @@
 
 # shellcheck source=utils/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
+# shellcheck source=utils/lib_go.sh
+source "${REPO_ROOT}/utils/lib_go.sh"
 # shellcheck source=utils/lib_install.sh
 source "${REPO_ROOT}/utils/lib_install.sh"
 
@@ -29,8 +31,6 @@ SERVICE_ENV_DEBUG=false
 
 GO_ENV="${SERVICE_HOME}/.go_env"
 GO_VERSION="go1.17.2"
-GO_PKG_URL="https://golang.org/dl/${GO_VERSION}.linux-amd64.tar.gz"
-GO_TAR=$(basename "$GO_PKG_URL")
 
 # shellcheck disable=SC2034
 CONFIG_FILES=()
@@ -234,7 +234,7 @@ install_all() {
     rst_title "Install $SERVICE_NAME (service)"
     assert_user
     wait_key
-    install_go "${GO_PKG_URL}" "${GO_TAR}" "${SERVICE_USER}"
+    go.golang "${GO_VERSION}" "${SERVICE_USER}"
     wait_key
     install_morty
     wait_key
@@ -306,9 +306,7 @@ install_check() {
 }
 
 go_version(){
-    sudo -i -u "$SERVICE_USER" <<EOF
-go version | cut -d' ' -f 3
-EOF
+    go.version "${SERVICE_USER}"
 }
 
 remove_all() {
@@ -338,12 +336,6 @@ EOF
     export SERVICE_HOME
     echo "export SERVICE_HOME=$SERVICE_HOME"
 
-    cat > "$GO_ENV" <<EOF
-export GOPATH=\$HOME/go-apps
-export PATH=\$HOME/local/go/bin:\$GOPATH/bin:\$PATH
-EOF
-    echo "Environment $GO_ENV has been setup."
-
     tee_stderr <<EOF | sudo -i -u "$SERVICE_USER"
 grep -qFs -- 'source $GO_ENV' ~/.profile || echo 'source $GO_ENV' >> ~/.profile
 EOF
@@ -353,22 +345,16 @@ morty_is_installed() {
     [[ -f $SERVICE_HOME/go-apps/bin/morty ]]
 }
 
-_svcpr="  ${_Yellow}|${SERVICE_USER}|${_creset} "
-
 install_morty() {
     rst_title "Install morty in user's ~/go-apps" section
     echo
-    tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr"
-go install -v github.com/asciimoo/morty@latest
-EOF
+    go.install github.com/asciimoo/morty@latest "${SERVICE_USER}"
 }
 
 update_morty() {
     rst_title "Update morty" section
     echo
-    tee_stderr <<EOF | sudo -i -u "$SERVICE_USER" 2>&1 | prefix_stdout "$_svcpr"
-go install -v github.com/asciimoo/morty@latest
-EOF
+    go.install github.com/asciimoo/morty@latest "${SERVICE_USER}"
 }
 
 set_service_env_debug() {
-- 
cgit v1.2.3