Linux installer now creates meanigfully-named temp dirs (adds DMDirc. prefix)

    - This might make it run on BSD/Solaris based systems, not tested
Added Start of OSX "Installer" (issue 421)
    - App Bundle is created and works, next step is .dmg file (then all done \o)
Reorganise osx icons into separate resource dir


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

installer/linux/makeInstallerLinux.sh

@@ -398,7 +398,7 @@ random() {
 	MKTEMP=`which mktemp`
 	if [ "" != "${MKTEMP}" ]; then
 		# mktemp exists \o
-		DIR=`${MKTEMP} -d`
+		DIR=`${MKTEMP} -d /tmp/DMDirc.XXXXXX`
 		eval "$1=${DIR}"
 		return;
 	fi

installer/release.sh

@@ -9,6 +9,9 @@ plugins_windows=""
 # Additional Jar names of plugins to add to only linux installers. (* means all)
 plugins_linux=""
 
+# Additional Jar names of plugins to add to only osx installers. (* means all)
+plugins_osx=""
+
 showHelp() {
 	echo "This will generate the different DMDirc installers."
 	echo "Usage: ${0} [params] <release>"
@@ -22,7 +25,8 @@ showHelp() {
 	echo "     --jre64                        Include a 64bit jre in the installers."
 	echo "-p,  --plugins <plugins>            Plugins to add to all the jars."
 	echo "-pl, --plugins-linux <plugins>      Plugins to linux installer."
-	echo "-pw, --plugins-windows <plugins>    Plugins to linux installer."
+	echo "-pw, --plugins-windows <plugins>    Plugins to windows installer."
+	echo "-po  --plugins-osx <plugins>        Plugins to osx installer."
 	echo "-h,  --help                         Help information"
 	echo "-o,  --opt <options>                Additional options to pass to the make*Installer.sh files"
 	echo "---------------------"
@@ -63,6 +67,10 @@ while test -n "$1"; do
 			shift
 			plugins_windows="${1}"
 			;;
+		--plugins-osx|-po)
+			shift
+			plugins_osx="${1}"
+			;;
 		--opt|-o)
 			shift
 			OPT="${1} "
@@ -77,7 +85,7 @@ while test -n "$1"; do
 	shift
 done
 
-if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*" ]; then
+if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*" -o "${plugins_osx}" = "*" ]; then
 	echo "Something is all.";
 	allPlugins=""
 	for thisfile in `ls -1 ../plugins/*.jar`; do
@@ -86,6 +94,7 @@ if [ "${plugins}" = "*" -o "${plugins_linux}" = "*" -o "${plugins_windows}" = "*
 	if [ "${plugins}" = "*" ]; then plugins=${allPlugins}; fi
 	if [ "${plugins_linux}" = "*" ]; then plugins_linux=${allPlugins}; fi
 	if [ "${plugins_windows}" = "*" ]; then plugins_windows=${allPlugins}; fi
+	if [ "${plugins_osx}" = "*" ]; then plugins_osx=${allPlugins}; fi
 fi;
 
 if [ "${LAST}" != "" ]; then
@@ -250,6 +259,13 @@ cd windows
 ./makeInstallerWindows.sh ${OPT}${JARFILE}${JRE}-k -s ${BRANCH}${RELEASE} -p "${plugins_windows}"
 cd ${THISDIR}
 
+echo "================================================================"
+echo "Building OSX Bundle"
+echo "================================================================"
+cd osx
+./makeInstallerOSX.sh ${OPT}${JARFILE}-k -s ${BRANCH}${RELEASE} -p "${plugins_osx}"
+cd ${THISDIR}
+
 
 #MD5BIN=`which md5sum`
 #if [ "${MD5BIN}" != "" ]; then