[or-cvs] r11317: Fix versioning to consider tags and branches. (incognito/trunk)

double at seul.org double at seul.org
Thu Aug 30 14:26:33 UTC 2007


Author: double
Date: 2007-08-30 10:26:33 -0400 (Thu, 30 Aug 2007)
New Revision: 11317

Modified:
   incognito/trunk/livecd-stage2.sh
Log:
Fix versioning to consider tags and branches.


Modified: incognito/trunk/livecd-stage2.sh
===================================================================
--- incognito/trunk/livecd-stage2.sh	2007-08-30 14:10:08 UTC (rev 11316)
+++ incognito/trunk/livecd-stage2.sh	2007-08-30 14:26:33 UTC (rev 11317)
@@ -1,4 +1,4 @@
-#!/bin/sh
+v!/bin/sh
 
 # Build a livecd-stage2 ensuring the .svn directories don't make it on
 
@@ -48,7 +48,16 @@
 INCOGNITO_TITLE="Incognito CD/USB"
 
 # Add revision
-INCOGNITO_TITLE="${INCOGNITO_TITLE} r$(svnversion)"
+SVN_URL="$(svn info --xml 2>/dev/null | grep url | sed 's/<url>\(.*\)<\/url>/\1/')"
+grep trunk <<EOF && INCOGNITO_TITLE="${INCOGNITO_TITLE} r$(svnversion)"
+${SVN_URL}
+EOF
+grep tags <<EOF && INCOGNITO_TITLE="${INCOGNITO_TITLE} $(basename ${SVN_URL})"
+${SVN_URL}
+EOF
+grep branches <<EOF && INCOGNITO_TITLE="${INCOGNITO_TITLE} $(basename ${SVN_URL}) r$(svnversion)"
+${SVN_URL}
+EOF
 
 export INCOGNITO INCOGNITO_TITLE
 



More information about the tor-commits mailing list