summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarIT.de>2020-04-02 16:16:18 +0000
committerGitHub <noreply@github.com>2020-04-02 16:16:18 +0000
commit70d114fab53ec0d826ae30f8dc48ee663c6cc3c4 (patch)
tree93e8a3a784577d2d1f3069231feb85c54f11829e
parent41f002b0ea3e82f9a2f7dd7b75dbbbf77b7986c0 (diff)
parent07932951f2c5d5ab7c89a78f389db2a9008d7631 (diff)
downloadsearxng-70d114fab53ec0d826ae30f8dc48ee663c6cc3c4.tar.gz
searxng-70d114fab53ec0d826ae30f8dc48ee663c6cc3c4.zip
Merge branch 'master' into rfc-travis
-rwxr-xr-xmanage.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/manage.sh b/manage.sh
index 4831fc1fa..b2ffb638d 100755
--- a/manage.sh
+++ b/manage.sh
@@ -121,8 +121,9 @@ docker_build() {
SEARX_GIT_VERSION=$(git describe --match "v[0-9]*\.[0-9]*\.[0-9]*" HEAD 2>/dev/null | awk -F'-' '{OFS="-"; $1=substr($1, 2); $3=substr($3, 2); print}')
# add the suffix "-dirty" if the repository has uncommited change
+ # /!\ HACK for searx/searx: ignore searx/brand.py and utils/brand.env
git update-index -q --refresh
- if [ ! -z "$(git diff-index --name-only HEAD --)" ]; then
+ if [ ! -z "$(git diff-index --name-only HEAD -- | grep -v 'searx/brand.py' | grep -v 'utils/brand.env')" ]; then
SEARX_GIT_VERSION="${SEARX_GIT_VERSION}-dirty"
fi