From 4dad3661461659dd39f88795f461fc19ac9c1fb5 Mon Sep 17 00:00:00 2001 From: Dalf Date: Thu, 2 Apr 2020 15:06:10 +0200 Subject: [PATCH] [fix] travis: fix docker tag. the "-dirty" ignores the searx/brand.py and utils/brand.env files. --- manage.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/manage.sh b/manage.sh index 4831fc1f..b2ffb638 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