ZaclysIndustries
/
searxngRebrandZaclys
forked from zaclys/searxng
2
0
Fork 0
Code Issues Pull Requests Activity

[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>
This commit is contained in:
Markus Heiser 2021-11-26 14:48:39 +01:00
parent da1d502cf7
commit ee8b6aac36
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils/searx.sh
View File

@ -402,11 +402,11 @@ install_check() {
update_searx() { update_searx() {
rst_title "Update SearXNG instance" 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" tee_stderr 0.3 <<EOF | sudo -H -u "${SERVICE_USER}" -i 2>&1 | prefix_stdout "$_service_prefix"
cd ${SEARX_SRC} cd ${SEARX_SRC}
git checkout -B "$GIT_BRANCH" git fetch origin "$GIT_BRANCH"
git pull git reset --hard "origin/$GIT_BRANCH"
pip install -U pip pip install -U pip
pip install -U setuptools pip install -U setuptools
pip install -U wheel pip install -U wheel