[Goodies-commits] r5264 - xfce4-mailwatch-plugin/trunk

[Brian Tarricone]

Author: kelnos
Date: 2008-08-17 08:15:34 +0000 (Sun, 17 Aug 2008)
New Revision: 5264

Modified:
   xfce4-mailwatch-plugin/trunk/autogen.sh
Log:
fetch revision from git properly

Modified: xfce4-mailwatch-plugin/trunk/autogen.sh
===================================================================
--- xfce4-mailwatch-plugin/trunk/autogen.sh	2008-08-17 08:15:23 UTC (rev 5263)
+++ xfce4-mailwatch-plugin/trunk/autogen.sh	2008-08-17 08:15:34 UTC (rev 5264)
@@ -32,13 +32,15 @@
 linguas=$(sed -e '/^#/d' po/LINGUAS)
 
 if [ -d .git/svn ]; then
-    revision=$(git-svn find-rev trunk)
+    revision=$(git svn find-rev trunk 2>/dev/null ||
+               git svn find-rev origin/trunk 2>/dev/null ||
+               git svn find-rev HEAD 2>/dev/null ||
+               git svn find-rev master 2>/dev/null)
 elif [ -d .svn ]; then
-    revision=$(LC_ALL=C svn info $0 | awk '/^Revision: /{ printf "%05d", $2 }')
+    revision=$(LC_ALL=C svn info $0 | awk '/^Revision: / {printf "%05d\n", $2}')
 else
     revision=UNKNOWN
 fi
-
 sed -e "s/@LINGUAS@/${linguas}/g" \
     -e "s/@REVISION@/${revision}/g" \
     < "configure.ac.in" >> "configure.ac"