on master help sign in
Merge branch 'master' into rfc-travis
commit70d114fab53ec0d826ae30f8dc48ee663c6cc3c4 authorMarkus Heiser <markus.heiser@darmarIT.de> dateThu 2 Apr 2020, 16:16 (7 years ago) parent41f002b0793295
1 file changed+2−1
manage.sh+2−1
manage.sh+2−1
@@ -121,8 +121,9 @@ docker_build() {
121121 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}')
122122
123123 # add the suffix "-dirty" if the repository has uncommited change
124+ # /!\ HACK for searx/searx: ignore searx/brand.py and utils/brand.env
124125 git update-index -q --refresh
125− if [ ! -z "$(git diff-index --name-only HEAD --)" ]; then
126+ if [ ! -z "$(git diff-index --name-only HEAD -- | grep -v 'searx/brand.py' | grep -v 'utils/brand.env')" ]; then
126127 SEARX_GIT_VERSION="${SEARX_GIT_VERSION}-dirty"
127128 fi
128129