|
@@ -162,12 +162,13 @@ weblate.to.translations() {
|
|
|
# remote 'weblate' and push it on branch 'translations' of 'origin'
|
|
|
|
|
|
( set -e
|
|
|
- if [ "$(pyenv.cmd wlc lock-status)" != "locked: True" ]; then
|
|
|
- die 1 "weblate must be locked, currently: $(pyenv.cmd wlc lock-status)"
|
|
|
+ pyenv.activate
|
|
|
+ if [ "$(wlc lock-status)" != "locked: True" ]; then
|
|
|
+ die 1 "weblate must be locked, currently: $(wlc lock-status)"
|
|
|
fi
|
|
|
# weblate: commit pending changes
|
|
|
- pyenv.cmd wlc pull
|
|
|
- pyenv.cmd wlc commit
|
|
|
+ wlc pull
|
|
|
+ wlc commit
|
|
|
|
|
|
# get the translations in a worktree
|
|
|
weblate.translations.worktree
|
|
@@ -189,8 +190,9 @@ weblate.translations.commit() {
|
|
|
|
|
|
local existing_commit_hash commit_body commit_message exitcode
|
|
|
( set -e
|
|
|
+ pyenv.activate
|
|
|
# lock change on weblate
|
|
|
- pyenv.cmd wlc lock
|
|
|
+ wlc lock
|
|
|
|
|
|
# get translations branch in git worktree (TRANSLATIONS_WORKTREE)
|
|
|
weblate.translations.worktree
|
|
@@ -204,7 +206,7 @@ weblate.translations.commit() {
|
|
|
|
|
|
# compile translations
|
|
|
build_msg BABEL 'compile translation catalogs into binary MO files'
|
|
|
- pyenv.cmd pybabel compile --statistics \
|
|
|
+ pybabel compile --statistics \
|
|
|
-d "searx/translations"
|
|
|
# git add/commit (no push)
|
|
|
commit_body=$(cd "${TRANSLATIONS_WORKTREE}"; git log --pretty=format:'%h - %as - %aN <%ae>' "${existing_commit_hash}..HEAD")
|
|
@@ -241,13 +243,13 @@ weblate.push.translations() {
|
|
|
last_commit_message exitcode
|
|
|
messages_pot="${TRANSLATIONS_WORKTREE}/searx/translations/messages.pot"
|
|
|
( set -e
|
|
|
-
|
|
|
+ pyenv.activate
|
|
|
# get translations branch in git worktree (TRANSLATIONS_WORKTREE)
|
|
|
weblate.translations.worktree
|
|
|
|
|
|
# update messages.pot in the master branch
|
|
|
build_msg BABEL 'extract messages from source files and generate POT file'
|
|
|
- pyenv.cmd pybabel extract -F babel.cfg \
|
|
|
+ pybabel extract -F babel.cfg \
|
|
|
-o "${messages_pot}" \
|
|
|
"searx/"
|
|
|
|
|
@@ -269,12 +271,13 @@ weblate.push.translations() {
|
|
|
fi
|
|
|
(
|
|
|
set -e
|
|
|
+ pyenv.activate
|
|
|
|
|
|
# lock change on weblate
|
|
|
# weblate may add commit(s) since the call to "weblate.translations.worktree".
|
|
|
# this is not a problem because after this line, "weblate.to.translations"
|
|
|
# calls again "weblate.translations.worktree" which calls "git pull"
|
|
|
- pyenv.cmd wlc lock
|
|
|
+ wlc lock
|
|
|
|
|
|
# save messages.pot in the translations branch for later
|
|
|
pushd "${TRANSLATIONS_WORKTREE}"
|
|
@@ -291,7 +294,7 @@ weblate.push.translations() {
|
|
|
|
|
|
# update messages.po files in the master branch
|
|
|
build_msg BABEL 'update existing message catalogs from POT file'
|
|
|
- pyenv.cmd pybabel update -N \
|
|
|
+ pybabel update -N \
|
|
|
-i "${messages_pot}" \
|
|
|
-d "${TRANSLATIONS_WORKTREE}/searx/translations"
|
|
|
|
|
@@ -307,12 +310,13 @@ weblate.push.translations() {
|
|
|
popd
|
|
|
|
|
|
# notify weblate to pull updated master & translations branch
|
|
|
- pyenv.cmd wlc pull
|
|
|
+ wlc pull
|
|
|
)
|
|
|
exitcode=$?
|
|
|
( # make sure to always unlock weblate
|
|
|
set -e
|
|
|
- pyenv.cmd wlc unlock
|
|
|
+ pyenv.activate
|
|
|
+ wlc unlock
|
|
|
)
|
|
|
dump_return $exitcode
|
|
|
}
|
|
@@ -389,8 +393,7 @@ docker.build() {
|
|
|
# See https://www.shellcheck.net/wiki/SC1001 and others ..
|
|
|
# shellcheck disable=SC2031,SC2230,SC2002,SC2236,SC2143,SC1001
|
|
|
( set -e
|
|
|
- # shellcheck source=/dev/null
|
|
|
- source "${PY_ENV_BIN}/activate"
|
|
|
+ pyenv.activate
|
|
|
|
|
|
# Check if it is a git repository
|
|
|
if [ ! -d .git ]; then
|
|
@@ -406,8 +409,8 @@ docker.build() {
|
|
|
|
|
|
# This is a git repository
|
|
|
git update-index -q --refresh
|
|
|
- pyenv.cmd python -m searx.version freeze
|
|
|
- eval "$(pyenv.cmd python -m searx.version)"
|
|
|
+ python -m searx.version freeze
|
|
|
+ eval "$(python -m searx.version)"
|
|
|
|
|
|
# Get the last git commit id
|
|
|
VERSION_GITCOMMIT=$(echo "$VERSION_STRING" | cut -d- -f3)
|
|
@@ -456,8 +459,7 @@ gecko.driver() {
|
|
|
build_msg INSTALL "gecko.driver"
|
|
|
# run installation in a subprocess and activate pyenv
|
|
|
( set -e
|
|
|
- # shellcheck source=/dev/null
|
|
|
- source "${PY_ENV_BIN}/activate"
|
|
|
+ pyenv.activate
|
|
|
|
|
|
# TODO : check the current geckodriver version
|
|
|
geckodriver -V > /dev/null 2>&1 || NOTFOUND=1
|