Merge branch 't/cmd_improvements'

[paraslash.git] / GIT-VERSION-GEN

diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 15c387942fad6748244a530728bf58edc69c83ff..df7ed327cb3f9b8f93ec596e629da4c08346e69a 100755 (executable)
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -16,7 +16,7 @@ elif [[ -d .git || -f .git ]] &&
        case "$VN" in
        *$LF*) (exit 1) ;;
        v[0-9]*)
-               git update-index -q --refresh
+               git update-index -q --refresh &>/dev/null
                test -z "$(git diff-index --name-only HEAD --)" ||
                VN="$VN-dirty" ;;
        esac
@@ -31,8 +31,10 @@ echo "$VN"
 
 [[ -z "$GVF" ]] && exit 0
 if [[ -r "$GVF" ]]; then
-       VC=$(sed -e 's/^#define GIT_VERSION "//; s/"$//' < "$GVF")
+       pattern='^#define GIT_VERSION "'
+       VC=$(grep "$pattern" < "$GVF" | sed -e "s/$pattern//; s/\"$//")
        [[ "$VN" == "$VC" ]] && exit 0
 fi
 echo >&2 "new git version: $VN"
-echo "#define GIT_VERSION \"$VN\"" >$GVF
+echo "/** \\file ${GVF##*/} Auto-generated version file. Do not edit. */" >$GVF
+echo "#define GIT_VERSION \"$VN\"" >> $GVF