Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 70d114fa authored by Markus Heiser's avatar Markus Heiser Committed by GitHub
Browse files

Merge branch 'master' into rfc-travis

parents 41f002b0 07932951
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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