Backport installer changes to 0.5.5.

Installer now creates a .jar in the output directory


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

installer/jar/makeJar.sh

@@ -161,7 +161,7 @@ jar -uvf "DMDirc.jar" ${pluginList}
 rm -Rf plugins;
 
 if [ "${isRelease}" != "" ]; then
-	if [ "${Branch}" != "" ]; then
+	if [ "${BRANCH}" = "1" ]; then
 		isRelease=branch-${isRelease}
 	fi;
 	if [ "" != "${finalTag}" ]; then

installer/linux/makeInstallerLinux.sh

@@ -289,9 +289,12 @@ chmod a+x ${RUNNAME}
 
 
 if [ "${isRelease}" != "" ]; then
-	if [ "${Branch}" != "" ]; then
+	if [ "${BRANCH}" = "1" ]; then
 		isRelease=branch-${isRelease}
 	fi;
+	if [ "" != "${finalTag}" ]; then
+		finalTag="-${finalTag}"
+	fi;
 	finalname=DMDirc-${isRelease}-Setup${finalTag}.run
 else
 	finalname=${RUNNAME##*/}

installer/windows/makeInstallerWindows.sh

@@ -499,7 +499,7 @@ echo "Creating .exe"
 cat 7zS.sfx 7zip.conf "${INTNAME}" > "${RUNNAME}"
 
 if [ "${isRelease}" != "" ]; then
-	if [ ${Branch} != "" ]; then
+	if [ "${BRANCH}" = "1" ]; then
 		releaseTag=branch-${isRelease}
 	else
 		releaseTag=${isRelease};