3e4d022 · searx · git.iko.soy

Makefile+1

compare with master

unifiedsplit

@@ -219,6 +219,7 @@ test.pylint: pyenvinstall

219

220# ubu1604: uses shellcheck v0.3.7 (from 04/2015), no longer supported!

221test.sh:

222+ shellcheck -x -s bash utils/brand.env

222 shellcheck -x utils/lib.sh

223 shellcheck -x utils/lib.sh

223 shellcheck -x utils/filtron.sh

224 shellcheck -x utils/filtron.sh

224 shellcheck -x utils/searx.sh

225 shellcheck -x utils/searx.sh

utils/lib.sh+1

@@ -1079,6 +1079,7 @@ in_container() {

1079

1080LXC_ENV_FOLDER=

1081if in_container; then

1082+ # shellcheck disable=SC2034

1082 LXC_ENV_FOLDER="lxc/$(hostname)/"

1083 LXC_ENV_FOLDER="lxc/$(hostname)/"

1083fi

1084fi

1084

1085

utils/lxc-searx.env+6−3

@@ -32,11 +32,13 @@ lxc_set_suite_env() {

32 export MORTY_LISTEN="0.0.0.0:3000"

33}

34

35+# shellcheck disable=SC2034

35−lxc_suite_install_info="suite includes searx, morty & filtron"

36+LXC_SUITE_INSTALL_INFO="suite includes searx, morty & filtron"

36lxc_suite_install() {

37lxc_suite_install() {

37 (

38 (

38 lxc_set_suite_env

39 lxc_set_suite_env

39− export FORCE_TIMEOUT=0

40+ FORCE_TIMEOUT=0

41+ export FORCE_TIMEOUT

40 "${LXC_REPO_ROOT}/utils/searx.sh" install all

42 "${LXC_REPO_ROOT}/utils/searx.sh" install all

41 "${LXC_REPO_ROOT}/utils/morty.sh" install all

43 "${LXC_REPO_ROOT}/utils/morty.sh" install all

42 "${LXC_REPO_ROOT}/utils/filtron.sh" install all

44 "${LXC_REPO_ROOT}/utils/filtron.sh" install all

@@ -50,7 +52,8 @@ lxc_suite_install() {

50lxc_suite_prepare_buildhost() {

52lxc_suite_prepare_buildhost() {

51 (

53 (

52 lxc_set_suite_env

54 lxc_set_suite_env

53− export FORCE_TIMEOUT=0

55+ FORCE_TIMEOUT=0

56+ export FORCE_TIMEOUT

54 # "${LXC_REPO_ROOT}/utils/searx.sh* install packages

57 # "${LXC_REPO_ROOT}/utils/searx.sh* install packages

55 "${LXC_REPO_ROOT}/utils/searx.sh" install buildhost

58 "${LXC_REPO_ROOT}/utils/searx.sh" install buildhost

56 rst_title "buildhost installation finished ($(hostname))" part

59 rst_title "buildhost installation finished ($(hostname))" part

utils/lxc.sh+3−2

@@ -104,7 +104,7 @@ cmd

104 -- run command '...' in all containers of the LXC suite

105 :<name>: run command '...' in container <name>

106install

107− :suite: install LXC suite; ${lxc_suite_install_info}

107+ :suite: install LXC suite; ${LXC_SUITE_INSTALL_INFO}

108 :base: prepare LXC; install basic packages

109 :buildhost: prepare LXC; install buildhost packages

110

@@ -241,13 +241,14 @@ main() {

241 sudo_or_exit

242 case $2 in

243 suite|base|buildhost)

244− lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install $2

244+ lxc_exec "${LXC_REPO_ROOT}/utils/lxc.sh" __install "$2"

245 ;;

246 *) usage "$_usage"; exit 42 ;;

247 esac

248 ;;

249 __install)

250 # wrapped install commands, called once in each container

251+ # shellcheck disable=SC2119

251 case $2 in

252 case $2 in

252 suite) lxc_suite_install ;;

253 suite) lxc_suite_install ;;

253 base) FORCE_TIMEOUT=0 lxc_install_base_packages ;;

254 base) FORCE_TIMEOUT=0 lxc_install_base_packages ;;

utils/morty.sh+1−1

@@ -16,7 +16,7 @@ in_container && lxc_set_suite_env

16

17PUBLIC_URL="${PUBLIC_URL:-http://$(uname -n)/searx}"

18PUBLIC_URL_PATH_MORTY="${PUBLIC_URL_PATH_MORTY:-/morty}"

19−PUBLIC_URL_MORTY="$(echo $PUBLIC_URL | sed -e's,^$.*://[^/]*$.*,\1,g')${PUBLIC_URL_PATH_MORTY}"

19+PUBLIC_URL_MORTY="$(echo "$PUBLIC_URL" | sed -e's,^$.*://[^/]*$.*,\1,g')${PUBLIC_URL_PATH_MORTY}"

20

21MORTY_LISTEN="${MORTY_LISTEN:-127.0.0.1:3000}"

22# shellcheck disable=SC2034