diff options
Diffstat (limited to 'manage')
| -rwxr-xr-x | manage | 35 |
1 files changed, 18 insertions, 17 deletions
@@ -25,7 +25,7 @@ pylint.FILES() { # These py files are linted by test.pylint(), all other files are linted by # test.pep8() - grep -l -r --include \*.py '^#[[:blank:]]*lint:[[:blank:]]*pylint' searx searx_extra tests + grep -l -r --include \*.py '^#[[:blank:]]*lint:[[:blank:]]*pylint' searx searxng_extra tests } YAMLLINT_FILES=() @@ -105,17 +105,17 @@ export DOCS_BUILD buildenv() { # settings file from repository's working tree are used by default - SEARX_SETTINGS_PATH="${REPO_ROOT}/searx/settings.yml" + SEARXNG_SETTINGS_PATH="${REPO_ROOT}/searx/settings.yml" if [ -r '/etc/searx/settings.yml' ]; then if ask_yn "should settings read from: /etc/searx/settings.yml"; then - SEARX_SETTINGS_PATH='/etc/searx/settings.yml' + SEARXNG_SETTINGS_PATH='/etc/searx/settings.yml' fi fi - export SEARX_SETTINGS_PATH + export SEARXNG_SETTINGS_PATH ( set -e - SEARX_DEBUG=1 pyenv.cmd python utils/build_env.py 2>&1 \ + SEARXNG_DEBUG=1 pyenv.cmd python utils/build_env.py 2>&1 \ | prefix_stdout "${_Blue}BUILDENV${_creset} " ) return "${PIPESTATUS[0]}" @@ -240,7 +240,7 @@ weblate.push.translations() { # 5. Notify Weblate to pull updated 'master' & 'translations' branch. local messages_pot diff_messages_pot last_commit_hash last_commit_detail \ - last_commit_message exitcode + exitcode messages_pot="${TRANSLATIONS_WORKTREE}/searx/translations/messages.pot" ( set -e pyenv.activate @@ -266,7 +266,7 @@ weblate.push.translations() { if [ "$exitcode" -eq 42 ]; then return 0 fi - if [ "$exitcode" ]; then + if [ "$exitcode" -gt 0 ]; then return $exitcode fi ( @@ -301,11 +301,12 @@ weblate.push.translations() { # git add/commit/push last_commit_hash=$(git log -n1 --pretty=format:'%h') last_commit_detail=$(git log -n1 --pretty=format:'%h - %as - %aN <%ae>' "${last_commit_hash}") - last_commit_message="[translations] update messages.pot and messages.po files\nFrom ${last_commit_detail}" pushd "${TRANSLATIONS_WORKTREE}" git add searx/translations - git commit -m "${last_commit_message}" + git commit \ + -m "[translations] update messages.pot and messages.po files" \ + -m "From ${last_commit_detail}" git push popd @@ -328,11 +329,11 @@ data.all() { data.useragents data.osm_keys_tags build_msg DATA "update searx/data/ahmia_blacklist.txt" - python searx_extra/update/update_ahmia_blacklist.py + python searxng_extra/update/update_ahmia_blacklist.py build_msg DATA "update searx/data/wikidata_units.json" - python searx_extra/update/update_wikidata_units.py + python searxng_extra/update/update_wikidata_units.py build_msg DATA "update searx/data/currencies.json" - python searx_extra/update/update_currencies.py + python searxng_extra/update/update_currencies.py ) } @@ -341,7 +342,7 @@ data.languages() { ( set -e pyenv.activate build_msg ENGINES "fetch languages .." - python searx_extra/update/update_languages.py + python searxng_extra/update/update_languages.py build_msg ENGINES "update update searx/languages.py" build_msg DATA "update searx/data/engines_languages.json" ) @@ -350,13 +351,13 @@ data.languages() { data.useragents() { build_msg DATA "update searx/data/useragents.json" - pyenv.cmd python searx_extra/update/update_firefox_version.py + pyenv.cmd python searxng_extra/update/update_firefox_version.py dump_return $? } data.osm_keys_tags() { build_msg DATA "update searx/data/osm_keys_tags.json" - pyenv.cmd python searx_extra/update/update_osm_keys_tags.py + pyenv.cmd python searxng_extra/update/update_osm_keys_tags.py dump_return $? } @@ -524,8 +525,8 @@ node.clean() { } pygments.less() { - build_msg PYGMENTS "searx_extra/update/update_pygments.py" - if ! pyenv.cmd python searx_extra/update/update_pygments.py; then + build_msg PYGMENTS "searxng_extra/update/update_pygments.py" + if ! pyenv.cmd python searxng_extra/update/update_pygments.py; then build_msg PYGMENTS "building LESS files for pygments failed" return 1 fi |