Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd9b877c authored by Markus Heiser's avatar Markus Heiser
Browse files

utils/searx.sh & filtron.sh: misc changes from first tests (WIP) 



Signed-off-by: default avatarMarkus Heiser <markus.heiser@darmarit.de>
parent 6274a547

utils/dot_config

+4 −3
Original line number Diff line number Diff line 
# -*- 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/')}"

utils/filtron.sh

+4 −2
Original line number Diff line number Diff line 
#!/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"
@@ -85,6 +85,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}



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}

utils/lib.sh

+1 −1
Original line number Diff line number Diff line
@@ -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"

}

utils/searx.sh

+2 −0
Original line number Diff line number Diff line
@@ -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}