From 237b1cfdb378187cdf597a328e28a64ab694012d Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Wed, 3 Mar 2021 18:22:41 +0100 Subject: [PATCH] [fix] support git versions ] [-r | -a] [--merged | --no-merged] .... Signed-off-by: Markus Heiser --- utils/searx.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/searx.sh b/utils/searx.sh index a33642ee4..b8fdd2eef 100755 --- a/utils/searx.sh +++ b/utils/searx.sh @@ -394,8 +394,8 @@ clone_searx() { info_msg "create local branch ${GIT_BRANCH} from start point: origin/${GIT_BRANCH}" git branch "${GIT_BRANCH}" "origin/${GIT_BRANCH}" fi - if [[ ! $(git branch --show-current) == "${GIT_BRANCH}" ]]; then - warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git branch --show-current)" + if [[ ! $(git rev-parse --abbrev-ref HEAD) == "${GIT_BRANCH}" ]]; then + warn_msg "take into account, installing branch $GIT_BRANCH while current branch is $(git rev-parse --abbrev-ref HEAD)" fi export SERVICE_HOME git_clone "$REPO_ROOT" "$SEARX_SRC" \