jandieman
/
searxng
mirror of https://github.com/searxng/searxng.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #236 from dalf/manage_without_brand 

manage script: remove unused reference to utils/brand.env and .config.sh
This commit is contained in:
Markus Heiser 2021-08-01 05:29:24 +00:00 committed by GitHub
parent 38ee88b390 a7a181064f
commit 5e3525a298
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manage
View File

@ -5,9 +5,6 @@
# shellcheck source=utils/lib.sh # shellcheck source=utils/lib.sh
source "$(dirname "${BASH_SOURCE[0]}")/utils/lib.sh" source "$(dirname "${BASH_SOURCE[0]}")/utils/lib.sh"
# shellcheck source=utils/brand.env
source "${REPO_ROOT}/utils/brand.env"
source_dot_config
# shellcheck source=utils/lib_static.sh # shellcheck source=utils/lib_static.sh
source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_static.sh" source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_static.sh"
@ -123,17 +120,6 @@ buildenv() {
return "${PIPESTATUS[0]}" return "${PIPESTATUS[0]}"
} }
buildenv.unset_env(){
# Some defaults in the settings.yml are taken from the environment,
# e.g. SEARX_BIND_ADDRESS (:py:obj:`searx.settings_defaults.SHEMA`). In
# some tasks (e.g. test.robot) we do not want these envorionment applied.
unset GIT_URL
unset GIT_BRANCH
unset SEARX_URL
unset SEARX_PORT
unset SEARX_BIND_ADDRESS
}
babel.compile() { babel.compile() {
build_msg BABEL compile build_msg BABEL compile
pyenv.cmd pybabel compile -d "${REPO_ROOT}/searx/translations" pyenv.cmd pybabel compile -d "${REPO_ROOT}/searx/translations"
@ -474,7 +460,6 @@ test.coverage() {
test.robot() { test.robot() {
build_msg TEST 'robot' build_msg TEST 'robot'
buildenv.unset_env
gecko.driver gecko.driver
PYTHONPATH=. pyenv.cmd python searx/testing.py robot PYTHONPATH=. pyenv.cmd python searx/testing.py robot
dump_return $? dump_return $?

3
utils/build_env.py
View File

@ -22,10 +22,9 @@ def _env(*arg, **kwargs):
val = '' val = ''
return val return val
# If you add or remove variables here, do not forgett to update: # If you add or remove variables here, do not forget to update:
# - ./docs/admin/engines/settings.rst # - ./docs/admin/engines/settings.rst
# - ./docs/dev/makefile.rst (section make buildenv) # - ./docs/dev/makefile.rst (section make buildenv)
# - ./manage function buildenv.unset_env()
name_val = [ name_val = [