diff options
| author | Alexandre Flament <alex@al-f.net> | 2021-07-21 14:27:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-21 14:27:49 +0200 |
| commit | 4f0d232a3dc95042be809d6fa6e93ca746156658 (patch) | |
| tree | 4155de82568afd651558cb91a5d59aa256577a19 /utils | |
| parent | 17e028e57928f7925a2d1ee1177d28ff33ff8487 (diff) | |
| parent | 19abaf272def8faee5e7d3652d95413c3256d638 (diff) | |
Merge pull request #213 from return42/drop-brand
[mod] drop searx.brand namespace
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/brand.env | 1 | ||||
| -rw-r--r-- | utils/build_env.py | 27 | ||||
| -rwxr-xr-x | utils/lib.sh | 12 | ||||
| -rw-r--r-- | utils/templates/etc/searx/use_default_settings.yml | 2 |
4 files changed, 26 insertions, 16 deletions
diff --git a/utils/brand.env b/utils/brand.env index 9cc52051d..e0c670a01 100644 --- a/utils/brand.env +++ b/utils/brand.env @@ -6,4 +6,3 @@ export DOCS_URL='https://searxng.github.io/searxng' export PUBLIC_INSTANCES='https://searx.space' export CONTACT_URL='' export WIKI_URL='https://github.com/searxng/searxng/wiki' -export TWITTER_URL='' diff --git a/utils/build_env.py b/utils/build_env.py index ffb2689e9..c52111e81 100644 --- a/utils/build_env.py +++ b/utils/build_env.py @@ -16,18 +16,25 @@ os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + '/settings.yml') # from /etc/searx/settings.yml. os.environ['SEARX_SETTINGS_PATH'] = abspath(dirname(__file__) + sep + 'settings.yml') -from searx import brand +from searx import get_setting + +def _env(*arg, **kwargs): + val = get_setting(*arg, **kwargs) + if val is True: + val = '1' + elif val is False: + val = '' + return val name_val = [ - ('SEARX_URL' , brand.SEARX_URL), - ('GIT_URL' , brand.GIT_URL), - ('GIT_BRANCH' , brand.GIT_BRANCH), - ('ISSUE_URL' , brand.ISSUE_URL), - ('DOCS_URL' , brand.DOCS_URL), - ('PUBLIC_INSTANCES' , brand.PUBLIC_INSTANCES), - ('CONTACT_URL' , brand.CONTACT_URL), - ('WIKI_URL' , brand.WIKI_URL), - ('TWITTER_URL' , brand.TWITTER_URL), + ('SEARX_URL' , _env('server.base_url','')), + ('GIT_URL' , _env('brand.git_url', '')), + ('GIT_BRANCH' , _env('brand.git_branch', '')), + ('ISSUE_URL' , _env('brand.issue_url', '')), + ('DOCS_URL' , _env('brand.docs_url', '')), + ('PUBLIC_INSTANCES' , _env('brand.public_instances', '')), + ('CONTACT_URL' , _env('general.contact_url', '')), + ('WIKI_URL' , _env('brand.wiki_url', '')), ] brand_env = 'utils' + sep + 'brand.env' diff --git a/utils/lib.sh b/utils/lib.sh index 014d4a740..d2f5b757e 100755 --- a/utils/lib.sh +++ b/utils/lib.sh @@ -606,9 +606,13 @@ pyenv.OK() { return 1 fi - pyenv.check \ - | "${PY_ENV_BIN}/python" 2>&1 \ - | prefix_stdout "${_Blue}PYENV ${_creset}[check] " + if [ "$VERBOSE" = "1" ]; then + pyenv.check \ + | "${PY_ENV_BIN}/python" 2>&1 \ + | prefix_stdout "${_Blue}PYENV ${_creset}[check] " + else + pyenv.check | "${PY_ENV_BIN}/python" 1>/dev/null + fi local err=${PIPESTATUS[1]} if [ "$err" -ne "0" ]; then @@ -616,7 +620,7 @@ pyenv.OK() { return "$err" fi - build_msg PYENV "OK" + [ "$VERBOSE" = "1" ] && build_msg PYENV "OK" _pyenv_OK="OK" return 0 } diff --git a/utils/templates/etc/searx/use_default_settings.yml b/utils/templates/etc/searx/use_default_settings.yml index f805373fe..1e7530cdc 100644 --- a/utils/templates/etc/searx/use_default_settings.yml +++ b/utils/templates/etc/searx/use_default_settings.yml @@ -25,7 +25,7 @@ server: secret_key: "ultrasecretkey" # change this! # Set custom base_url. Possible values: # false or "https://your.custom.host/location/" - base_url: https://darmarit.org/searx + # base_url: https://example.org/searx # Proxying image results through searx image_proxy: false |