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

Unverified Commit 5e3525a2 authored by Markus Heiser's avatar Markus Heiser Committed by GitHub
Browse files

Merge pull request #236 from dalf/manage_without_brand 

manage script: remove unused reference to utils/brand.env and .config.sh
parents 38ee88b3 a7a18106

manage

+0 −15
Original line number Diff line number Diff line
@@ -5,9 +5,6 @@ 


# shellcheck source=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

source "$(dirname "${BASH_SOURCE[0]}")/utils/lib_static.sh"
@@ -123,17 +120,6 @@ buildenv() { 
    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() {

    build_msg BABEL compile

    pyenv.cmd pybabel compile -d "${REPO_ROOT}/searx/translations"
@@ -474,7 +460,6 @@ test.coverage() { 


test.robot() {

    build_msg TEST 'robot'

    buildenv.unset_env

    gecko.driver

    PYTHONPATH=. pyenv.cmd python searx/testing.py robot

    dump_return $?

utils/build_env.py

+1 −2
Original line number Diff line number Diff line
@@ -22,10 +22,9 @@ def _env(*arg, **kwargs): 
        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/dev/makefile.rst (section make buildenv)

# - ./manage function buildenv.unset_env()



name_val = [