Include channel in config, and specify nightly channel in BuildAll.sh

BuildAll.sh

@@ -34,14 +34,6 @@ SVNREV=`$SVN info | grep Revision`
 SVNREV=${SVNREV##*: }
 export DMDIRC_SVN=${SVNREV}
 
-# Substitute the version string
-awk '{gsub(/String VERSION = "SVN"/,"String VERSION = \"Nightly - SVN Rev: '${SVNREV}'\"");print}' src/com/dmdirc/Main.java > src/com/dmdirc/Main.java.tmp
-mv src/com/dmdirc/Main.java.tmp src/com/dmdirc/Main.java
-
-# Substitute the update channel
-awk '{gsub(/UpdateChannel UPDATE_CHANNEL = UpdateChannel.NONE/,"UpdateChannel UPDATE_CHANNEL = UpdateChannel.NIGHTLY");print}' src/com/dmdirc/Main.java > src/com/dmdirc/Main.java.tmp
-mv src/com/dmdirc/Main.java.tmp src/com/dmdirc/Main.java
-
 # Archive old nightlies
 if [ `date +%d` = "01" ]; then
 	echo "Archiving Last Months Nightlies"
@@ -68,7 +60,7 @@ if [ -e "${HOME}/www/updates/" ]; then
 fi;
 
 # Build plugins/jar
-$ANT -k clean jar
+$ANT -Dchannel=NIGHTLY -k clean jar
 
 # Now revert the trunk so as not to break updates.
 for updatedir in ${REVERTLIST}; do

build-versioning.xml

@@ -29,8 +29,7 @@ version:
         </exec>
     </target>
 
-    <target name="-add-svn-version" if="is.svn" depends="-add-svn-bash"/>
-    <target name="-add-svn-bash" if="has.bash">
+    <target name="-add-svn-version" if="is.svn">
         <exec dir="." executable="/bin/bash" output="${version.config}" append="true">
             <arg value="-c"/>
             <arg value="svn log -l 1 | grep ^Git-version | cut -f 2 -d ' '"/>
@@ -43,8 +42,12 @@ updater:
     channel=</echo>
     </target>
 
-    <target name="-add-channel">
-        <echo file="${version.config}" append="true">NIGHTLY</echo>
+    <target name="-init-channel" unless="channel">
+        <property name="channel" value="NONE"/>
+    </target>
+
+    <target name="-add-channel" depends="-init-channel">
+        <echo file="${version.config}" append="true">${channel}</echo>
     </target>
 
 </project>