Browse Source

[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>
Markus Heiser 3 years ago
parent
commit
ee8b6aac36
1 changed files with 3 additions and 3 deletions
  1. 3 3
      utils/searx.sh

+ 3 - 3
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