[or-cvs] r16360: The build script now makes cleaner titles for tags (without (in incognito/trunk: . root_overlay/usr/share/incognito root_overlay/usr/share/incognito/walkthrough)

Sat Aug 2 15:45:33 UTC 2008

Author: anonym
Date: 2008-08-02 11:45:33 -0400 (Sat, 02 Aug 2008)
New Revision: 16360

Modified:
   incognito/trunk/livecd-stage2.sh
   incognito/trunk/root_overlay/usr/share/incognito/docs.html
   incognito/trunk/root_overlay/usr/share/incognito/walkthrough/walkthrough.html
Log:
The build script now makes cleaner titles for tags (without revision number).
Also, make the documentation and walkthrough use the new titles.


Modified: incognito/trunk/livecd-stage2.sh
===================================================================

--- incognito/trunk/livecd-stage2.sh	2008-08-02 15:43:39 UTC (rev 16359)
+++ incognito/trunk/livecd-stage2.sh	2008-08-02 15:45:33 UTC (rev 16360)
@@ -67,18 +67,16 @@
 # If building a tag, set type to tag name.
 # If building a branch, type to branch name.
 SVN_URL="$(svn info --xml 2>/dev/null | grep url | sed 's/<url>\(.*\)<\/url>/\1/')"
-grep trunk >/dev/null <<EOF && INCOGNITO_TYPE="trunk"
+grep trunk >/dev/null <<EOF && INCOGNITO_TYPE="trunk" && INCOGNITO_VERSION="${INCOGNITO_TYPE} (${INCOGNITO_REVISION})"
 ${SVN_URL}
 EOF
-grep tags >/dev/null <<EOF && INCOGNITO_TYPE="$(basename ${SVN_URL})"
+grep tags >/dev/null <<EOF && INCOGNITO_TYPE="$(basename ${SVN_URL})" && INCOGNITO_VERSION="${INCOGNITO_TYPE}"
 ${SVN_URL}
 EOF
-grep branches >/dev/null <<EOF && INCOGNITO_TYPE="$(basename ${SVN_URL})"
+grep branches >/dev/null <<EOF && INCOGNITO_TYPE="$(basename ${SVN_URL})" && INCOGNITO_VERSION="${INCOGNITO_TYPE} (${INCOGNITO_REVISION})"
 ${SVN_URL}
 EOF
 
-INCOGNITO_VERSION="${INCOGNITO_TYPE} (${INCOGNITO_REVISION})"
-
 INCOGNITO_TITLE="${INCOGNITO_TITLE} ${INCOGNITO_VERSION}"
 
 echo "========"

Modified: incognito/trunk/root_overlay/usr/share/incognito/docs.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/docs.html	2008-08-02 15:43:39 UTC (rev 16359)
+++ incognito/trunk/root_overlay/usr/share/incognito/docs.html	2008-08-02 15:45:33 UTC (rev 16360)
@@ -1,11 +1,11 @@
 <html>
 <head>
-<title>The __INCOGNITO__ Documentation</title>
+<title>__INCOGNITO_TITLE__ Documentation</title>
 </head>
 
 <body>
 
-<h1>The __INCOGNITO__ Documentation</h1>
+<h1>__INCOGNITO_TITLE__ Documentation</h1>
 
 <h2>Contents</h2>
 <ul>

Modified: incognito/trunk/root_overlay/usr/share/incognito/walkthrough/walkthrough.html
===================================================================
--- incognito/trunk/root_overlay/usr/share/incognito/walkthrough/walkthrough.html	2008-08-02 15:43:39 UTC (rev 16359)
+++ incognito/trunk/root_overlay/usr/share/incognito/walkthrough/walkthrough.html	2008-08-02 15:45:33 UTC (rev 16360)
@@ -1,12 +1,12 @@
 <!doctype html public "-//W3C//DTD HTML 4.0 Transitional//EN">
 <html>
 <head>
-	<title>The __INCOGNITO__ Walkthrough</title>
+	<title>__INCOGNITO_TITLE__ Walkthrough</title>
 </head>
 
 <body>
 
-<h1>The __INCOGNITO__ Walkthrough</h1>
+<h1>__INCOGNITO_TITLE__ Walkthrough</h1>
 <h2>Contents</h2>
 
 <ul>

