mirror of
https://github.com/searxng/searxng.git
synced 2024-11-22 12:10:11 +01:00
[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:
parent
da1d502cf7
commit
ee8b6aac36
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user