From cd9b877c8c186925e7eab5088554fcf5fc2ca5d5 Mon Sep 17 00:00:00 2001
From: Markus Heiser <markus.heiser@darmarit.de>
Date: Fri, 31 Jan 2020 15:53:53 +0100
Subject: [PATCH] utils/searx.sh & filtron.sh: misc changes from first tests
 (WIP)

Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
---
 utils/dot_config | 7 ++++---
 utils/filtron.sh | 6 ++++--
 utils/lib.sh     | 2 +-
 utils/searx.sh   | 2 ++
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/utils/dot_config b/utils/dot_config
index e4c283744..0d6758a18 100644
--- a/utils/dot_config
+++ b/utils/dot_config
@@ -1,8 +1,9 @@
 # -*- coding: utf-8; mode: sh -*-
 # SPDX-License-Identifier: AGPL-3.0-or-later
 #
-# Set environment used by ./utils scripts like filtron.sh or searx.sh
+# environment used by utils scripts like filtron.sh or searx.sh
 #
 
-# Public URL of the searx instance
-PUBLIC_URL="${PUBLIC_URL:-https://$(uname -n)/searx}"
+# the public URL of the searx instance
+PUBLIC_URL="${PUBLIC_URL:-http://$(uname -n)/searx}"
+PUBLIC_HOST="${PUBLIC_HOST:-$(echo "$PUBLIC_URL" | sed -e 's/[^/]*\/\/\([^@]*@\)\?\([^:/]*\).*/\2/')}"
diff --git a/utils/filtron.sh b/utils/filtron.sh
index d6e5b6a1b..9559902dd 100755
--- a/utils/filtron.sh
+++ b/utils/filtron.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- coding: utf-8; mode: sh indent-tabs-mode: nil -*-
 # SPDX-License-Identifier: AGPL-3.0-or-later
-# shellcheck disable=SC2119
+# shellcheck disable=SC2119,SC2001
 
 # shellcheck source=utils/lib.sh
 source "$(dirname "${BASH_SOURCE[0]}")/lib.sh"
@@ -84,7 +84,8 @@ apache
 If needed change the environment variable PUBLIC_URL of your WEB service in the
 ${DOT_CONFIG#"$REPO_ROOT/"} file:
 
-  PUBLIC_URL : ${PUBLIC_URL}
+  PUBLIC_URL   : ${PUBLIC_URL}
+  PUBLIC_HOST  : ${PUBLIC_HOST}
 
 EOF
     [ ! -z ${1+x} ] &&  echo -e "$1"
@@ -335,6 +336,7 @@ inspect_service() {
 sourced ${DOT_CONFIG#"$REPO_ROOT/"} :
 
   PUBLIC_URL          : ${PUBLIC_URL}
+  PUBLIC_HOST         : ${PUBLIC_HOST}
   FILTRON_URL_PATH    : ${FILTRON_URL_PATH}
   FILTRON_API         : ${FILTRON_API}
   FILTRON_LISTEN      : ${FILTRON_LISTEN}
diff --git a/utils/lib.sh b/utils/lib.sh
index 0586b2575..a3c3ee63d 100755
--- a/utils/lib.sh
+++ b/utils/lib.sh
@@ -440,7 +440,7 @@ service_is_available() {
     case "$http_code" in
         404|410|423) exit_val=$http_code;;
     esac
-    return $exit_val
+    return "$exit_val"
 }
 
 
diff --git a/utils/searx.sh b/utils/searx.sh
index b036541cf..359ae7124 100755
--- a/utils/searx.sh
+++ b/utils/searx.sh
@@ -102,6 +102,7 @@ If needed change the environment variable PUBLIC_URL of your WEB service in the
 ${DOT_CONFIG#"$REPO_ROOT/"} file:
 
   PUBLIC_URL          : ${PUBLIC_URL}
+  PUBLIC_HOST         : ${PUBLIC_HOST}
   SEARX_INSTANCE_NAME : ${SEARX_INSTANCE_NAME}
 
 EOF
@@ -481,6 +482,7 @@ inspect_service() {
 sourced ${DOT_CONFIG#"$REPO_ROOT/"} :
 
   PUBLIC_URL          : ${PUBLIC_URL}
+  PUBLIC_HOST         : ${PUBLIC_HOST}
   SEARX_URL_PATH      : ${SEARX_URL_PATH}
   SEARX_INSTANCE_NAME : ${SEARX_INSTANCE_NAME}
   SEARX_INTERNAL_URL  : ${SEARX_INTERNAL_URL}