Fix bug in preparing the launcher.

Change-Id: I2e310e364c26ba86eba428b2d94a08cb89c8b666
Reviewed-on: http://gerrit.dmdirc.com/1757
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

installer/linux/makeInstallerLinux.sh

@@ -234,7 +234,7 @@ else
 	TAILOPTS="-n +"
 fi;
 
-FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" installerstub.sh`
+FUNCTIONSLINE=`grep ${GREPOPTS} "^\s*###FUNCTIONS_FILE###\s*$" installerstub.sh`
 FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
 
 head -n ${FUNCTIONSLINE} installerstub.sh  > ${RUNNAME}
@@ -316,7 +316,7 @@ if [ -e "${jarPath}/launcher/unix" ]; then
 			FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
 
 			head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
-			cat functions.sh >> ${DESTFILE}
+			cat ${FUNCTIONSFILE} >> ${DESTFILE}
 			echo "" >> ${DESTFILE}
 			tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
 		fi;

launcher/createUpdate.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # This script generates the launcher updates
 LAUNCHERDIR=`dirname $0`
-LAUNCHERUPDATEDIR="/home/dmdirc/www/updates/launchers/"
+LAUNCHERUPDATEDIR="/tmp/launchers/"
 
 UNIXVERSION=`cat ${LAUNCHERDIR}/unix/DMDirc.sh | grep LAUNCHERVERSION= | awk -F\" '{print $2}'`
 WINDOWSVERSION=`cat ${LAUNCHERDIR}/windows/DMDirc.dpr | grep "launcherVersion: String =" | awk -F\' '{print $2}'`
@@ -23,31 +23,33 @@ else
 fi;
 
 if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
-	/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: unix-${UNIXVERSION}";
+echo	/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: unix-${UNIXVERSION}";
 	
 	FUNCTIONSFILE="${LAUNCHERDIR}/../installer/linux/functions.sh"
 	SRCFILE=${LAUNCHERDIR}/unix/DMDirc.sh
 	DESTFILE=${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh
 	
 	if [ -e "${FUNCTIONSFILE}" ]; then
-		FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" ${SRCFILE}`
+		FUNCTIONSLINE=`grep ${GREPOPTS} "^\s*###FUNCTIONS_FILE###\s*$" ${SRCFILE}`
 		if [ "${FUNCTIONSLINE}" == "" ]; then
 			cp ${SRCFILE} ${DESTFILE}
 		else
 			FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
 			
 			head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
-			cat functions.sh >> ${DESTFILE}
+			cat ${FUNCTIONSFILE} >> ${DESTFILE}
 			echo "" >> ${DESTFILE}
 			tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
 		fi;
 	else
-		/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Unable to create unix launcher update, no functions.sh found."
+echo		/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Unable to create unix launcher update, no functions.sh found."
 	fi;
 fi;
 
+exit 0;
+
 if [ ! -e "${LAUNCHERUPDATEDIR}/windows-${WINDOWSVERSION}.zip" ]; then
-	/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: windows-${WINDOWSVERSION}";
+echo	/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: windows-${WINDOWSVERSION}";
 	OLDDIR=${PWD}
 	cd ${LAUNCHERDIR}/windows
 	sh compile.sh

launcher/unix/DMDirc.sh

@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-LAUNCHERVERSION="17"
+LAUNCHERVERSION="18"
 LAUNCHERINFO="unix-${LAUNCHERVERSION}"
 
 params=""