Fix installer build scripts to include plugins correctly.

Change-Id: Ic23d1d927dd5dabe6a9ee0597a026d932f59b4e6
Reviewed-on: http://gerrit.dmdirc.com/22
Reviewed-by: Chris Smith <chris@dmdirc.com>
Tested-by: Shane Mc Cormack <shane@dmdirc.com>

installer/jar/makeJar.sh

@@ -116,8 +116,8 @@ while test -n "$1"; do
 			BRANCH="1"
 			;;
 		--tag|-t)
-			shift
 			if [ ${isSVN} -eq 1 ]; then
+				shift
 				REGEX="^[0-9]+(\.[0-9]+(\.[0-9]+)?)?$"
 				CHECKTAG=`echo ${1} | egrep "${REGEX}"`
 				if [ "" = "${CHECKTAG}" ]; then
@@ -193,6 +193,9 @@ fi;
 echo "Copying jar (${jarfile} -> ${RUNNAME}).."
 cp ${jarfile} ${RUNNAME}
 
+# Remove plugins added by createAllPluginJar
+zip -d ${RUNNAME} plugins plugins/*
+
 if [ "${plugins}" != "" ]; then
 	echo "Adding plugins to jar"
 	ln -sf ${jarPath}"/plugins"

installer/release.sh

@@ -164,9 +164,6 @@ if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*
 	if [ "${plugins_osx}" = "*" ]; then plugins_osx=${allPlugins}; fi
 fi;
 
-# Remove plugins added by createAllPluginJar
-zip -d dist/DMDirc.jar plugins plugins/*
-
 if [ ${isSVN} -eq 1 ]; then
 	VERSION=""
 	if [ "${LAST}" != "" ]; then