Replace profile-based hack to allow getname() to handle 8-bit

[nmh] / config / version.sh

diff --git a/config/version.sh b/config/version.sh
index 6257186f86dfca5a2d7bb1f35881f73d1f2799d3..a0105e3626b2b04423eb3615ad39c866432ce277 100755 (executable)
--- a/config/version.sh
+++ b/config/version.sh
@@ -4,8 +4,6 @@
 #
 # You need to pass the script the version number to use.
 #
-# $Id$
-#
 
 if [ -z "$1" ]; then
     echo "usage: version.sh VERSION" 1>&2
@@ -40,5 +38,13 @@ done
 
 IFS=" "
 
-echo "char *version_str = \"nmh-$VERSION [compiled on $HOSTNAME at `date`]\";"
+if [ -d "${srcdir}/.git" ] ; then
+    branch=`(git branch | grep '^\*' | tr -d '* ') || true`
+fi
+if [ "${branch}" -a "${branch}" != "master" ] ; then
+    echo "char *version_str = \"nmh-$VERSION [branch ${branch}] [compiled on $HOSTNAME at `date`]\";"
+else
+    echo "char *version_str = \"nmh-$VERSION [compiled on $HOSTNAME at `date`]\";"
+fi
 echo "char *version_num = \"nmh-$VERSION\";"
+echo "char *user_agent = \"nmh/$VERSION\";"