AddSVN.sh now uses sed and --post removes all older crap.

Fixes issue 1265.


git-svn-id: http://svn.dmdirc.com/trunk@4093 00569f92-eb28-0410-84fd-f71c24880f

AddSVN.sh

@@ -1,50 +1,25 @@
 #!/bin/sh
 
 SVN=`which svn`
-AWK=`which gawk`
-TYPE="gawk"
-AWK=""
-if [ "" = "${AWK}" ]; then
-	AWK=`which mawk`
-	TYPE="mawk"
-	if [ "" = "${AWK}" ]; then
-		echo "Unknown awk variation, not running."
-		exit 0;
-	fi;
+SED=`which sed`
+if [ "" = "${SED}" ]; then
+	echo "This needs sed."
+	exit 0;
 fi;
 
 SVNREV=`$SVN info | grep Revision`
 SVNREV=${SVNREV##*: }
 
-if [ "${TYPE}" = "mawk" ]; then
-	PRE='int SVN_REVISION = '
-	POST='int SVN_REVISION = '${SVNREV}';'
-	if [ "${1}" = "--pre" ]; then
-		POST=${POST}' // ';
-	elif [ "${1}" = "--post" ]; then
-		POST=${POST}' \/\/ ';
-	fi;
-elif [ "${TYPE}" = "gawk" ]; then
-	PRE='int SVN_REVISION = '
-	POST='int SVN_REVISION = '${SVNREV}'; \/\/ '
-fi;
-
-OLD=""
-
 if [ "${1}" = "--pre" ]; then
 	# Substitute the version string
-	OLD=${PRE}
-	NEW=${POST}
+	${SED} -r 's/int SVN_REVISION = /int SVN_REVISION = '${SVNREV}'; \/\/ /' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
 elif [ "${1}" = "--post" ]; then
 	# Unsubstitute the version string
-	OLD=${POST}
-	NEW=${PRE}
+	${SED} -r 's/int SVN_REVISION = .* ([0-9]+);/int SVN_REVISION = \1;/' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
+fi;
+
+if [ -e ${PWD}/src/com/dmdirc/Main.java.tmp ]; then
+	mv ${PWD}/src/com/dmdirc/Main.java.tmp ${PWD}/src/com/dmdirc/Main.java
 fi;
 
-if [ "" != "${OLD}" ]; then
-	${AWK} '{gsub(/'"${OLD}"'/,"'"${NEW}"'");print}' ${PWD}/src/com/dmdirc/Main.java > ${PWD}/src/com/dmdirc/Main.java.tmp 2>/dev/null
-	if [ -e ${PWD}/src/com/dmdirc/Main.java.tmp ]; then
-		mv ${PWD}/src/com/dmdirc/Main.java.tmp ${PWD}/src/com/dmdirc/Main.java
-	fi;
-	# cat ${PWD}/src/com/dmdirc/Main.java | grep SVN
-fi;
+cat ${PWD}/src/com/dmdirc/Main.java | grep SVN

src/com/dmdirc/Main.java

@@ -53,7 +53,7 @@ public final class Main {
     public static final String VERSION = "SVN";
 
     /** The SVN revision that this build was made from. */
-    public static final int SVN_REVISION = 4007; // 4007; // 4007; // 4007; // 4007; // 4007; // 4007; // 4007; // 3999;
+    public static final int SVN_REVISION = 4085;
 
     /** Stores the update channel that this version came from, if any. */
     public static final UpdateChannel UPDATE_CHANNEL = UpdateChannel.NONE;