git.iko.soy/searx
on master help sign in
Merge pull request #2417 from return42/fix-seetings-template
d129186Alexandre Flament
.config.sh+4−1
compare with master
unifiedsplit
@@ -28,7 +28,10 @@ fi
28# SEARX_INTERNAL_URL="127.0.0.1:8888"
28# SEARX_INTERNAL_URL="127.0.0.1:8888"
29# SEARX_SETTINGS_TEMPLATE="${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml"
29# SEARX_SETTINGS_TEMPLATE="${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml"
30
30
31−# Only change, if you maintain a searx brand in your searx fork.
31+# Only change, if you maintain a searx brand in your searx fork (GIT_URL) which
32+# is not hold by branch 'master'. The branch has to be a local branch, in the
33+# repository from which you install (which is most often the case). If you want
34+# to install branch 'foo', don't forget to run 'git branch foo origin/foo' once.
32# GIT_BRANCH="${GIT_BRANCH:-master}"
35# GIT_BRANCH="${GIT_BRANCH:-master}"
33
36
34# filtron.sh
37# filtron.sh
utils/searx.sh+11−3
@@ -36,7 +36,7 @@ GIT_BRANCH="${GIT_BRANCH:-master}"
36SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
36SEARX_PYENV="${SERVICE_HOME}/searx-pyenv"
37SEARX_SRC="${SERVICE_HOME}/searx-src"
37SEARX_SRC="${SERVICE_HOME}/searx-src"
38SEARX_SETTINGS_PATH="/etc/searx/settings.yml"
38SEARX_SETTINGS_PATH="/etc/searx/settings.yml"
39−SEARX_SETTINGS_TEMPLATE="${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml"
39+SEARX_SETTINGS_TEMPLATE="${SEARX_SETTINGS_TEMPLATE:-${REPO_ROOT}/utils/templates/etc/searx/use_default_settings.yml}"
40SEARX_UWSGI_APP="searx.ini"
40SEARX_UWSGI_APP="searx.ini"
41# shellcheck disable=SC2034
41# shellcheck disable=SC2034
42SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
42SEARX_UWSGI_SOCKET="/run/uwsgi/app/searx/socket"
@@ -157,7 +157,7 @@ install / remove
157 :searx-src: clone $GIT_URL
157 :searx-src: clone $GIT_URL
158 :pyenv: create/remove virtualenv (python) in $SEARX_PYENV
158 :pyenv: create/remove virtualenv (python) in $SEARX_PYENV
159 :uwsgi: install searx uWSGI application
159 :uwsgi: install searx uWSGI application
160− :settings: reinstall settings from ${REPO_ROOT}/searx/settings.yml
160+ :settings: reinstall settings from ${SEARX_SETTINGS_TEMPLATE}
161 :packages: install needed packages from OS package manager
161 :packages: install needed packages from OS package manager
162 :buildhost: install packages from OS package manager needed by buildhosts
162 :buildhost: install packages from OS package manager needed by buildhosts
163update searx
163update searx
@@ -388,6 +388,14 @@ clone_searx() {
388 err_msg "to clone searx sources, user $SERVICE_USER hast to be created first"
388 err_msg "to clone searx sources, user $SERVICE_USER hast to be created first"
389 return 42
389 return 42
390 fi
390 fi
391+ if [[ ! $(git show-ref "refs/heads/${GIT_BRANCH}") ]]; then
392+ warn_msg "missing local branch ${GIT_BRANCH}"
393+ info_msg "create local branch ${GIT_BRANCH} from start point: origin/${GIT_BRANCH}"
394+ git branch "${GIT_BRANCH}" "origin/${GIT_BRANCH}"
395+ fi
396+ if [[ ! $(git branch --show-current) == "${GIT_BRANCH}" ]]; then
397+ warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git branch --show-current)"
398+ fi
391 export SERVICE_HOME
399 export SERVICE_HOME
392 git_clone "$REPO_ROOT" "$SEARX_SRC" \
400 git_clone "$REPO_ROOT" "$SEARX_SRC" \
393 "$GIT_BRANCH" "$SERVICE_USER"
401 "$GIT_BRANCH" "$SERVICE_USER"
@@ -412,7 +420,7 @@ install_settings() {
412 mkdir -p "$(dirname ${SEARX_SETTINGS_PATH})"
420 mkdir -p "$(dirname ${SEARX_SETTINGS_PATH})"
413
421
414 if [[ ! -f ${SEARX_SETTINGS_PATH} ]]; then
422 if [[ ! -f ${SEARX_SETTINGS_PATH} ]]; then
415− info_msg "install settings ${REPO_ROOT}/searx/settings.yml"
423+ info_msg "install settings ${SEARX_SETTINGS_TEMPLATE}"
416 info_msg " --> ${SEARX_SETTINGS_PATH}"
424 info_msg " --> ${SEARX_SETTINGS_PATH}"
417 cp "${SEARX_SETTINGS_TEMPLATE}" "${SEARX_SETTINGS_PATH}"
425 cp "${SEARX_SETTINGS_TEMPLATE}" "${SEARX_SETTINGS_PATH}"
418 configure_searx
426 configure_searx