diff options
| author | Markus Heiser <markus.heiser@darmarit.de> | 2021-11-26 14:48:39 +0100 |
|---|---|---|
| committer | Markus Heiser <markus.heiser@darmarit.de> | 2021-11-26 15:15:17 +0100 |
| commit | ee8b6aac36b2ed304664cd4c7eadf0813bca3d80 (patch) | |
| tree | 012f8fa4e616e1596e788eb54edd79afeb7344e1 /utils/searx.sh | |
| parent | da1d502cf7096c0c2f43b6b88dc413f91a43ebba (diff) | |
| download | searxng-ee8b6aac36b2ed304664cd4c7eadf0813bca3d80.tar.gz searxng-ee8b6aac36b2ed304664cd4c7eadf0813bca3d80.zip | |
[fix] searx.sh update: replace git pull by a hard reset
If the fetched branch has been rebased a 'git pull' will fails. To get fetched
branch in the working tree, a git reset is needed.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'utils/searx.sh')
| -rwxr-xr-x | utils/searx.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/searx.sh b/utils/searx.sh index 09af3819d..819afef13 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -402,11 +402,11 @@ install_check() { update_searx() { rst_title "Update SearXNG instance" - echo + rst_para "fetch from $GIT_URL and reset to origin/$GIT_BRANCH" tee_stderr 0.3 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 | prefix_stdout "$_service_prefix" cd ${SEARX_SRC} -git checkout -B "$GIT_BRANCH" -git pull +git fetch origin "$GIT_BRANCH" +git reset --hard "origin/$GIT_BRANCH" pip install -U pip pip install -U setuptools pip install -U wheel |