Move installers and launchers into modules/installer and rewrite build scripts.

Change-Id: I10ba0cdd82cad1bd33c76b6f2b90e87b9a00b483
Depends-On: I2d518110abbf37196d11c8110c54ad20f34a115e
Reviewed-on: http://gerrit.dmdirc.com/1737
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

build-installer.xml

@@ -8,9 +8,8 @@
 
     <target name="installer"
             description="Build the installer.">
-        <exec executable="bash" dir="installer" resultproperty="installer.result">
-            <arg value="release.sh"/>
-            <arg value="this"/>
+        <exec executable="bash" dir="modules/installer" resultproperty="installer.result">
+            <arg value="makeAll.sh"/>
         </exec>
 
         <condition property="installer.success">
@@ -19,15 +18,14 @@
 
         <echo message="Installer build finished."/>
         <echo message="Completed build files can be found in:"/>
-        <echo message="    ${installer.output.dir}"/>
+        <echo message="    ./modules/installer/output"/>
         <echo message=""/>
     </target>
 
     <target name="installer-stable"
             description="Build the installer for a stable release.">
-        <exec executable="bash" dir="installer" resultproperty="installer.result">
-            <arg value="release.sh"/>
-            <arg value="-t"/>
+        <exec executable="bash" dir="modules/installer" resultproperty="installer.result">
+            <arg value="makeAll.sh"/>
             <arg value="-c"/>
             <arg value="STABLE"/>
             <arg value="--upload"/>
@@ -45,9 +43,8 @@
 
     <target name="installer-unstable"
             description="Build the installer for an unstable release.">
-        <exec executable="bash" dir="installer" resultproperty="installer.result">
+        <exec executable="bash" dir="modules/installer" resultproperty="installer.result">
             <arg value="release.sh"/>
-            <arg value="-t"/>
             <arg value="-c"/>
             <arg value="UNSTABLE"/>
         </exec>
@@ -58,7 +55,7 @@
 
         <echo message="Installer build finished."/>
         <echo message="Completed build files can be found in:"/>
-        <echo message="    ${installer.output.dir}"/>
+        <echo message="    ./modules/installer/output"/>
         <echo message=""/>
     </target>
 

build-versioning.xml

@@ -10,7 +10,7 @@
 
     <available file=".git" property="is.git"/>
 
-    <target name="-write-version" depends="-write-version-header, -add-version, -write-updater, -write-identities"/>
+    <target name="-write-version" depends="-write-version-header, -add-version, -write-updater, -write-identities, -write-disable-updates"/>
 
     <target name="-write-version-header">
         <echo file="${version.config}"># This is a DMDirc configuration file automatically generated by
@@ -43,6 +43,17 @@ version:
         <property name="channel" value="NONE"/>
     </target>
 
+    <target name="with.disabled.updater">
+        <property name="disableupdates" value="true" />
+    </target>
+
+    <target name="-write-disable-updates" if="disableupdates">
+        <echo file="${version.config}" append="true">
+version:
+    noupdates=true
+</echo>
+    </target>
+
     <target name="-write-updater" depends="-init-channel, -read-identities">
         <echo file="${version.config}" append="true">
 updater:

installer/gcode/googlecode_upload.py

@@ -1,206 +0,0 @@
-#!/usr/bin/env python
-#
-# Copyright 2006, 2007 Google Inc. All Rights Reserved.
-# Author: danderson@google.com (David Anderson)
-#
-# Script for uploading files to a Google Code project.
-#
-# This is intended to be both a useful script for people who want to
-# streamline project uploads and a reference implementation for
-# uploading files to Google Code projects.
-#
-# To upload a file to Google Code, you need to provide a path to the
-# file on your local machine, a small summary of what the file is, a
-# project name, and a valid account that is a member or owner of that
-# project.  You can optionally provide a list of labels that apply to
-# the file.  The file will be uploaded under the same name that it has
-# in your local filesystem (that is, the "basename" or last path
-# component).  Run the script with '--help' to get the exact syntax
-# and available options.
-#
-# Note that the upload script requests that you enter your
-# googlecode.com password.  This is NOT your Gmail account password!
-# This is the password you use on googlecode.com for committing to
-# Subversion and uploading files.  You can find your password by going
-# to http://code.google.com/hosting/settings when logged in with your
-# Gmail account. If you have already committed to your project's
-# Subversion repository, the script will automatically retrieve your
-# credentials from there (unless disabled, see the output of '--help'
-# for details).
-#
-# If you are looking at this script as a reference for implementing
-# your own Google Code file uploader, then you should take a look at
-# the upload() function, which is the meat of the uploader.  You
-# basically need to build a multipart/form-data POST request with the
-# right fields and send it to https://PROJECT.googlecode.com/files .
-# Authenticate the request using HTTP Basic authentication, as is
-# shown below.
-#
-# Licensed under the terms of the Apache Software License 2.0:
-#  http://www.apache.org/licenses/LICENSE-2.0
-#
-# Questions, comments, feature requests and patches are most welcome.
-# Please direct all of these to the Google Code users group:
-#  http://groups.google.com/group/google-code-hosting
-
-"""Google Code file uploader script.
-"""
-
-__author__ = 'danderson@google.com (David Anderson) [Modified for DMDirc by Shane McCormack: shane@dmdirc.com]'
-
-import httplib
-import os.path
-import optparse
-import getpass
-import base64
-import sys
-
-
-
-def upload(file, project_name, user_name, password, summary, labels=None):
-  """Upload a file to a Google Code project's file server.
-
-  Args:
-    file: The local path to the file.
-    project_name: The name of your project on Google Code.
-    user_name: Your Google account name.
-    password: The googlecode.com password for your account.
-              Note that this is NOT your global Google Account password!
-    summary: A small description for the file.
-    labels: an optional list of label strings with which to tag the file.
-
-  Returns: a tuple:
-    http_status: 201 if the upload succeeded, something else if an
-                 error occured.
-    http_reason: The human-readable string associated with http_status
-    file_url: If the upload succeeded, the URL of the file on Google
-              Code, None otherwise.
-  """
-  # The login is the user part of user@gmail.com. If the login provided
-  # is in the full user@domain form, strip it down.
-  if '@' in user_name:
-    user_name = user_name[:user_name.index('@')]
-
-  form_fields = [('summary', summary)]
-  if labels is not None:
-    form_fields.extend([('label', l.strip()) for l in labels])
-
-  content_type, body = encode_upload_request(form_fields, file)
-
-  upload_host = '%s.googlecode.com' % project_name
-  upload_uri = '/files'
-  auth_token = base64.b64encode('%s:%s'% (user_name, password))
-  headers = {
-    'Authorization': 'Basic %s' % auth_token,
-    'User-Agent': 'Googlecode.com uploader v0.9.4 (DMDirc)',
-    'Content-Type': content_type,
-    }
-
-  server = httplib.HTTPSConnection(upload_host)
-  server.request('POST', upload_uri, body, headers)
-  resp = server.getresponse()
-  server.close()
-
-  if resp.status == 201:
-    location = resp.getheader('Location', None)
-  else:
-    location = None
-  return resp.status, resp.reason, location
-
-
-def encode_upload_request(fields, file_path):
-  """Encode the given fields and file into a multipart form body.
-
-  fields is a sequence of (name, value) pairs. file is the path of
-  the file to upload. The file will be uploaded to Google Code with
-  the same file name.
-
-  Returns: (content_type, body) ready for httplib.HTTP instance
-  """
-  BOUNDARY = '----------Googlecode_boundary_reindeer_flotilla'
-  CRLF = '\r\n'
-
-  body = []
-
-  # Add the metadata about the upload first
-  for key, value in fields:
-    body.extend(
-      ['--' + BOUNDARY,
-       'Content-Disposition: form-data; name="%s"' % key,
-       '',
-       value,
-       ])
-
-  # Now add the file itself
-  file_name = os.path.basename(file_path)
-  f = open(file_path, 'rb')
-  file_content = f.read()
-  f.close()
-
-  body.extend(
-    ['--' + BOUNDARY,
-     'Content-Disposition: form-data; name="filename"; filename="%s"'
-     % file_name,
-     # The upload server determines the mime-type, no need to set it.
-     'Content-Type: application/octet-stream',
-     '',
-     file_content,
-     ])
-
-  # Finalize the form body
-  body.extend(['--' + BOUNDARY + '--', ''])
-
-  return 'multipart/form-data; boundary=%s' % BOUNDARY, CRLF.join(body)
-
-
-
-def main():
-  parser = optparse.OptionParser(usage='googlecode-upload.py -s SUMMARY '
-                                 '[options] FILE')
-  parser.add_option('-s', '--summary', dest='summary',
-                    help='Short description of the file')
-  parser.add_option('-u', '--user', dest='user',
-                    help='Your Google Code username')
-  parser.add_option('--pass', dest='password',
-                    help='Your Google Code password')
-  parser.add_option('-l', '--labels', dest='labels',
-                    help='An optional list of labels to attach to the file')
-
-  options, args = parser.parse_args()
-
-  if not options.summary:
-    parser.error('File summary is missing.')
-  elif not options.user:
-    parser.error('Username is missing.')
-  elif not options.password:
-    parser.error('Password is missing.')
-  elif len(args) < 1:
-    parser.error('File to upload not provided.')
-  elif len(args) > 1:
-    parser.error('Only one file may be specified.')
-
-  file_path = args[0]
-
-  if options.labels:
-    labels = options.labels.split(',')
-  else:
-    labels = None
-
-#  print 'Summary: %s' % options.summary
-#  print 'Labels: %s' % options.labels
-#  print 'Path: %s' % file_path
-
-  status, reason, url = upload(file_path, 'dmdirc', options.user, options.password, options.summary, labels)
-
-  if url:
-    print 'The file was uploaded successfully.'
-    print 'URL: %s' % url
-    return 0
-  else:
-    print 'An error occurred. Your file was not uploaded.'
-    print 'Google Code upload server said: %s (%s)' % (reason, status)
-    return 1
-
-
-if __name__ == '__main__':
-  sys.exit(main())

installer/gcode/uploads_release.sh

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-# Leave blank here, loaded from config file.
-USERNAME=""
-PASSWORD=""
-
-# Load stored password.
-if [ -e "${HOME}/.GoogleCode" ]; then
-. ${HOME}/.GoogleCode
-fi;
-
-PYTHON=`which python`
-if [ "" = "${PYTHON}" ]; then
-	echo 'Python not found. Aborting.'
-	exit 1;
-fi;
-
-VERSION=""
-while test -n "$1"; do
-	LAST=${1}
-	case "$1" in
-		--version|-v)
-			shift
-			VERSION="${1}"
-			;;
-	esac
-	shift
-done
-
-if [ "" = "${VERSION}" ]; then
-	echo "Version not specified. Aborting"
-	exit 1;
-fi;
-
-if [ "" = "${USERNAME}" ]; then
-	echo "Username not found (Check: ${HOME}/.GoogleCode)"
-#	exit 1;
-fi;
-if [ "" = "${PASSWORD}" ]; then
-	echo "Password not found (Check: ${HOME}/.GoogleCode)"
-#	exit 1;
-fi;
-
-uploadFile() {
-	TYPE=${1}
-	LABELS=${2}
-	FILE=${3}
-	
-	if [ -e "../output/${FILE}" ]; then
-		echo ""
-		echo "Uploading ${TYPE}"
-		${PYTHON} ${PWD}/googlecode_upload.py --summary "DMDirc ${VERSION} ${TYPE}" --user ${USERNAME} --pass ${PASSWORD} --labels="Featured,${LABELS}" ${FILE}
-	else
-		echo "Not Uploading ${TYPE} (File '${FILE}' Doesn't exist)"
-	fi;
-}
-
-uploadFile "Jar" "Type-Executable,OpSys-All" "../output/DMDirc-${VERSION}.jar"
-uploadFile "OS X Image" "Type-Archive,OpSys-OSX" "../output/DMDirc-${VERSION}.dmg"
-uploadFile "Windows Installer" "Type-Installer,OpSys-Windows" "../output/DMDirc-${VERSION}-Setup.exe"
-uploadFile "Unix Installer" "Type-Installer,OpSys-Linux,OpSys-BSD,OpSys-Solaris" "../output/DMDirc-${VERSION}-Setup.run"
-exit 0;

installer/jar/makeJar.sh

@@ -1,184 +0,0 @@
-#!/bin/sh
-#
-# This script generates a jar file for a release version of DMDirc
-#
-# DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Final Name of the file (without file extention)
-FILENAME=DMDirc
-# full name of the file to output to
-RUNNAME="${PWD}/${FILENAME}.jar"
-
-# Go!
-echo "-----------"
-if [ -e "${RUNNAME}" ]; then
-	echo "Removing existing file"
-	rm -Rf ${RUNNAME}
-fi
-
-showHelp() {
-	echo "This will generate a DMDirc jar file for any system with java on it."
-	echo "The following command line arguments are known:"
-	echo "---------------------"
-	echo "-h, --help                Help information"
-	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
-	echo "-c, --compile             Recompile the .jar file (otherwise use the existing file from dist/)"
-	echo "    --jar <file>          use <file> as DMDirc.jar (ie just add the plugins to it and rename)"
-	echo "    --current             Use the current folder as the base for the build"
-	echo "-e, --extra <tag>         Tag to add to final name to distinguish this build from a standard build"
-	echo "    --channel [channel]  Channel to pass to ant (if not passed, 'NONE', if passed without a value, 'STABLE')"
-	echo "---------------------"
-	exit 0;
-}
-
-# Check for some CLI params
-compileJar="false"
-isRelease=""
-finalTag=""
-BRANCH="0"
-plugins=""
-location="../../"
-current="1"
-jarfile=""
-jre=""
-jrename="jre" # Filename for JRE without the .bin
-TAGGED=""
-CHANNEL="NONE"
-while test -n "$1"; do
-	case "$1" in
-		--plugins|-p)
-			shift
-			plugins=${1}
-			;;
-		--jar)
-			shift
-			jarfile=${1}
-			;;
-		--current)
-			location="../../"
-			current="1"
-			;;
-		--compile|-c)
-			compileJar="true"
-			;;
-		--release|-r)
-			shift
-			isRelease=${1}
-			;;
-		--extra|-e)
-			shift
-			finalTag=${1}
-			RUNNAME="${PWD}/${FILENAME}-${1}.jar"
-			;;
-		--help|-h)
-			showHelp;
-			;;
-		--branch|-b)
-			BRANCH="1"
-			;;
-		--tag|-t)
-			TAGGED=`git describe --tags`
-			TAGGED=${TAGGED%%-*}
-			;;
-		--channel)
-			PASSEDPARAM=`echo "${2}" | grep -v ^-`
-			if [ "${PASSEDPARAM}" != "" ]; then
-				shift
-				CHANNEL=${PASSEDPARAM};
-			else
-				CHANNEL="STABLE";
-			fi;
-			;;
-	esac
-	shift
-done
-if [ "" = "${current}" ]; then
-	jarPath="${location}trunk"
-else
-	jarPath="${location}"
-fi
-
-if [ "" = "${jarfile}" ]; then
-	jarfile=${jarPath}"/dist/DMDirc.jar"
-	if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
-		echo "Creating jar.."
-		OLDPWD=${PWD}
-		cd ${jarPath}
-
-		ant -Dchannel=${CHANNEL} clean jar
-		if [ ! -e "dist/DMDirc.jar" ]; then
-			echo "There was an error creating the .jar file. Aborting."
-			exit 1;
-		fi;
-		cd ${OLDPWD}
-	fi;
-elif [ ! -e "${jarfile}" ]; then
-	echo "Requested Jar file (${jarfile}) does not exist."
-	exit 1;
-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"
-	pluginList=""
-	for plugin in ${plugins}; do
-		pluginList=${pluginList}" plugins/${plugin}"
-	done
-	jar -uvf "${RUNNAME}" ${pluginList}
-
-        ../../updateBundledPlugins.sh ${RUNNAME};
-	rm -Rf plugins;
-fi;
-
-doRename=0
-if [ "${TAGGED}" != "" ]; then
-	doRename=1	
-fi;
-
-if [ ${doRename} -eq 1 ]; then
-	if [ "${TAGGED}" = "" ]; then
-		isRelease=branch-${isRelease}
-	else
-		isRelease=${TAGGED}
-	fi;
-
-	if [ "" != "${finalTag}" ]; then
-		finalTag="-${finalTag}"
-	fi;
-	finalname=DMDirc-${isRelease}${finalTag}.jar
-else
-	finalname=${RUNNAME##*/}
-fi;
-
-mv ${RUNNAME} ../output/${finalname}
-echo "-----------"
-echo "Done."
-echo "-----------"
-
-# and Done \o
-exit 0;

installer/linux/functions.sh

@@ -1,139 +0,0 @@
-#!/bin/sh
-
-# Check for OS X
-OSASCRIPT=`which osascript`
-KERNEL=`uname -s`
-ISOSX="0"
-# Kernel is darwin, and osascript exists, probably OS X!
-if [ "${KERNEL}" = "Darwin" -a "" != "${OSASCRIPT}" ]; then
-	ISOSX="1"
-fi;
-
-if [ "${ISOSX}" != "1" ]; then
-	PIDOF=`which pidof`
-	if [ "${PIDOF}" = "" ]; then
-		# For some reason some distros hide pidof...
-		if [ -e /sbin/pidof ]; then
-			PIDOF=/sbin/pidof
-		elif [ -e /usr/sbin/pidof ]; then
-			PIDOF=/usr/sbin/pidof
-		fi;
-	fi;
-	
-	PGREP=`which pgrep`
-	if [ "${PIDOF}" != "" ]; then
-		ISKDE=`${PIDOF} -x -s kdeinit kdeinit4`
-		ISGNOME=`${PIDOF} -x -s gnome-panel`
-	elif [ "${PGREP}" != "" ]; then
-		ISKDE=`pgrep kdeinit`
-		ISGNOME=`pgrep gnome-panel`
-	else
-		ISKDE=`ps -Af | grep kdeinit | grep -v grep`
-		ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
-	fi;
-	KDIALOG=`which kdialog`
-	ZENITY=`which zenity`
-	DIALOG=`which dialog`
-	
-	KSUDO=`which kdesudo`
-	GSUDO=`which gksudo`
-fi;
-
-if [ "${ISKDE}" != "" -o "${ZENITY}" = "" ]; then
-	USEKDIALOG="1";
-else
-	USEKDIALOG="0";
-fi;
-
-messagedialog() {
-	# Send message to console.
-	echo ""
-	echo "-----------------------------------------------------------------------"
-	echo "DMDirc: ${1}"
-	echo "-----------------------------------------------------------------------"
-	echo "${2}"
-	echo "-----------------------------------------------------------------------"
-
-
-	# If we are on OSX
-	if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-		echo "Displaying dialog.."
-		${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"${1}\n${2}\" buttons {\"Ok\"} giving up after 120 with icon note" -e 'end tell'
-	elif [ "" != "${KDIALOG}" -a "" != "${DISPLAY}" -a "" = "${ISGNOME}" -a "${USEKDIALOG}" = "1" ]; then
-		# else if kdialog exists, and we have a display, and we are not running
-		# gnome, and either we are running kde or zenity doesn't exist..
-		echo "Dialog on Display: ${DISPLAY}"
-		${KDIALOG} --title "DMDirc: ${1}" --msgbox "${2}"
-	elif [ "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-		# Else, if zenity exists and we have a display
-		echo "Dialog on Display: ${DISPLAY}"
-		${ZENITY} --info --title "DMDirc: ${1}" --text "${2}"
-	elif [ "" != "${DIALOG}" ]; then
-		# Else, if dialog exists and we have a display
-		${DIALOG} --title "DMDirc: ${1}" --msgbox "${2}" 8 40 
-	fi;
-}
-
-questiondialog() {
-	# Send question to console.
-	echo ""
-	echo "-----------------------------------------------------------------------"
-	echo "DMDirc: ${1}"
-	echo "-----------------------------------------------------------------------"
-	echo "${2}"
-	echo "-----------------------------------------------------------------------"
-
-	# If we are on OSX
-	if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-		echo "Displaying dialog.."
-		${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"Line 1\nLine 2\" with icon note" -e 'end tell'
-	elif [ "" != "${KDIALOG}" -a "" != "${DISPLAY}" -a "" = "${ISGNOME}" -a "${USEKDIALOG}" = "1" ]; then
-		# else if kdialog exists, and we have a display, and we are not running
-		# gnome, and either we are running kde or zenity doesn't exist..
-		echo "Dialog on Display: ${DISPLAY}"
-		${KDIALOG} --title "DMDirc: ${1}" --yesno "${2}"
-	elif [ "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-		# Else, if zenity exists and we have a display
-		echo "Dialog on Display: ${DISPLAY}"
-		${ZENITY} --question --title "DMDirc: ${1}" --text "${2}"
-	elif [ "" != "${DIALOG}" ]; then
-		# Else, if dialog exists and we have a display
-		${DIALOG} --title "DMDirc: ${1}" --yesno "${2}" 8 40
-	elif [ "${3}" != "" ]; then
-		# Else, fail and return default.
-		echo "Unable to ask question, assuming '${3}'."
-		return ${3};
-	else
-		# Else, fail and return no.
-		echo "Unable to ask question, assuming no."
-		return 1;
-	fi;
-}
-
-errordialog() {
-	# Send error to console.
-	echo ""
-	echo "-----------------------------------------------------------------------"
-	echo "[Error] DMDirc: ${1}"
-	echo "-----------------------------------------------------------------------"
-	echo "${2}"
-	echo "-----------------------------------------------------------------------"
-
-	# If we are on OSX
-	if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-		echo "Displaying dialog.."
-		${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"${1}\n${2}\" buttons {\"Ok\"} with icon stop" -e 'end tell'
-	elif [ "" != "${KDIALOG}" -a "" != "${DISPLAY}" -a "" = "${ISGNOME}" -a "${USEKDIALOG}" = "1" ]; then
-		# else if kdialog exists, and we have a display, and we are not running
-		# gnome, and either we are running kde or zenity doesn't exist..
-		echo "Dialog on Display: ${DISPLAY}"
-		${KDIALOG} --title "DMDirc: ${1}" --error "${2}"
-	elif [ "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-		# Else, if zenity exists and we have a display
-		echo "Dialog on Display: ${DISPLAY}"
-		${ZENITY} --error --title "DMDirc: ${1}" --text "${2}"
-	elif [ "" != "${DIALOG}" ]; then
-		# Else, if dialog exists and we have a display
-		${DIALOG} --title "[Error] DMDirc: ${1}" --msgbox "${2}" 8 40
-	fi
-}

installer/linux/getjre.sh

@@ -1,166 +0,0 @@
-#!/bin/sh
-#
-# This script downloads a JRE.
-#
-
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Find out where we are
-BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
-
-PIDOF=`which pidof`
-if [ "${PIDOF}" = "" ]; then
-	# For some reason some distros hide pidof...
-	if [ -e /sbin/pidof ]; then
-		PIDOF=/sbin/pidof
-	elif [ -e /usr/sbin/pidof ]; then
-		PIDOF=/usr/sbin/pidof
-	fi;
-fi;
-
-if [ -e "${BASEDIR}/functions.sh" ]; then
-	. ${BASEDIR}/functions.sh
-else
-	echo "Unable to find functions.sh, unable to continue."
-	exit 1;
-fi;
-
-# Get the JRE.
-ARCH=`uname -m`
-ISAINFO=`which isainfo`
-ISFREEBSD=`uname -s | grep -i FreeBSD`
-if [ "${ISAINFO}" != "" ]; then
-	# Solaris-ish
-	ARCH=`uname -p`
-fi;
-URL="http://www.dmdirc.com/getjava/`uname -s`/${ARCH}"
-if [ "${ISFREEBSD}" != "" ]; then
-	RELEASE=`uname -r`
-	URL="${URL}/${RELEASE}"
-fi;
-
-WGET=`which wget`
-FETCH=`which fetch`
-CURL=`which curl`
-if [ "${WGET}" != "" ]; then
-	length=`${WGET} --spider ${URL} 2>&1 | grep "Length:"| awk '{print $2, $3}' | sed 's/,//g'`
-	actualLength=${length%% *}
-elif [ "${FETCH}" != "" ]; then
-	actualLength=`${FETCH} -s ${URL}`
-elif [ "${CURL}" != "" ]; then
-	length=`${CURL} -# -I ${URL} 2>&1 | grep "Content-Length:"| awk '{print $2}'`
-fi;
-
-# Convert the length from Bytes to something user-friendly is possible.
-BC=`which bc`
-if [ "${BC}" = "" ]; then
-	niceLength=${actualLength}"B"
-elif [ ${actualLength} -ge 1048576 ]; then
-	niceLength=`echo "scale=2; ${actualLength}/1048576" | bc`"MB"
-elif [ ${actualLength} -ge 1024 ]; then
-	niceLength=`echo "scale=2; ${actualLength}/1024" | bc`"KB"
-else
-	niceLength=`echo "scale=2; ${actualLength}" | bc`"B"
-fi;
-
-if [ "${actualLength}" = "6" ]; then
-	# Unable to download.
-	errordialog "Download Failed" "Unable to find JRE for this platform (`uname -s`/${ARCH})."
-	exit 1;
-fi;
-
-PIPE=""
-wgetpid=""
-# Make sure wget and the progressbar die if we do.
-badclose() {
-	if [ "${wgetpid}" != "" ]; then
-		kill -9 ${wgetpid}
-	fi;
-	if [ "${PIPE}" != "" ]; then
-		if [ -e ${PIPE} ]; then
-			echo "quit" > ${PIPE}
-			echo "Closing badly, pipe still exists."
-		fi
-	fi
-}
-trap 'badclose' INT TERM EXIT
-
-if [ "" != "${1}" ]; then
-	questiondialog "Download JRE" "${1} (Download Size: ${niceLength})"
-	result=$?
-else
-		questiondialog "Download JRE" "Would you like to download the java JRE? (Download Size: ${niceLength})\n(Choose no if you want to manually install or install using a package manager)"
-	result=$?
-fi;
-if [ $result -eq 0 ]; then
-	PIPE=`mktemp progresspipe.XXXXXXXXXXXXXX`
-	if [ "${WGET}" != "" ]; then
-		${WGET} -q -O jre.bin ${URL} &
-		wgetpid=${!}
-	elif [ "${FETCH}" != "" ]; then
-		${FETCH} -q -o jre.bin ${URL} &
-		wgetpid=${!}
-	elif [ "${CURL}" != "" ]; then
-		${CURL} -s -o jre.bin ${URL} &
-		wgetpid=${!}
-	fi;
-	/bin/sh ${PWD}/progressbar.sh "Downloading JRE.." ${actualLength} ${PIPE} ${wgetpid} &
-	sleep 1;
-	progressbarpid=${!}
-	while [ `ps -p ${wgetpid} | wc -l` = 2 ]; do
-		SIZE=`ls -l jre.bin | awk '{print $5}'`
-		if [ -e ${PIPE} ]; then
-			echo "${SIZE}" > ${PIPE}
-		else
-			kill -9 ${wgetpid}
-			errordialog "Download Canceled" "Download Canceled by user"
-			exit 1;
-		fi;
-	done;
-	if [ -e ".downloadWasCancelled" ]; then
-		kill -9 ${wgetpid}
-		errordialog "Download Canceled" "Download Canceled by user"
-		exit 1;
-	fi;
-	SIZE=`ls -l jre.bin | awk '{print $5}'`
-	/bin/sh ${PWD}/progressbar.sh --watchdog ${progressbarpid} &
-	if [ -e ${PIPE} ]; then
-		echo "${SIZE}" > ${PIPE}
-	fi;
-	wgetpid=""
-	if [ "${ISFREEBSD}" != "" -o "${ISAINFO}" != "" ]; then
-		echo "Killing progressbar"
-		kill ${progressbarpid}
-	fi;
-	messagedialog "Download Completed" "Download Completed"
-	if [ -e ${PIPE} ]; then
-		echo "Deleting Pipe ${PIPE}"
-		rm -Rf "${PIPE}"
-	fi;
-	exit 0;
-else
-	messagedialog "Download JRE" "JRE Download Canceled"
-	exit 1;
-fi;
-exit 1;

installer/linux/installerstub.sh

@@ -1,344 +0,0 @@
-#!/bin/sh
-#
-# This script installs dmdirc
-#
-# DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-MD5=""
-
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Find out what params we should pass to things.
-# Solaris has a nice and ancient version of grep in /usr/bin
-grep -na "" /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	GREPOPTS="-n"
-else
-	GREPOPTS="-na"
-fi;
-# Solaris also has a crappy version of tail!
-tail -n +1 /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	TAILOPTS="+"
-else
-	TAILOPTS="-n +"
-fi;
-
-###ADDITIONAL_STUFF###
-
-###FUNCTIONS_FILE###
-
-# Location of .run stub end
-ENDLINE=`grep ${GREPOPTS} "^###END STUB###$" $0`
-ENDLINE=$((${ENDLINE%%:*} + 1))
-
-if [ "" = "${ENDLINE}" ]; then
-	errordialog "DMDirc Setup" "End of stub not found. Aborting.";
-	exit 0;
-fi
-
-# Attempt to get a name for a random dir in /tmp
-random() {
-	# First off, lets try mktemp.
-	MKTEMP=`which mktemp`
-	if [ "" != "${MKTEMP}" ]; then
-		# mktemp exists \o
-		DIR=`${MKTEMP} -d /tmp/DMDirc.XXXXXX`
-		eval "$1=${DIR}"
-		return;
-	fi
-
-	TMPDIR=${TMPDIR:=/tmp}
-	BASEDIR=${TMPDIR}dmdirc_`whoami`_
-	DIR=${PWD}
-	while [ -d "${DIR}" ]; do
-		if [ "" != "${RANDOM}" ]; then
-			# Bash has a psuedo random number generator that can be accessed
-			# using ${RANDOM}
-			RND=${RANDOM}${RANDOM}${RANDOM}
-		else
-			# Dash (the ubuntu default sh) however does not.
-			# od and awk however usually exist, and we can get a random number
-			# from /dev/urandom or /dev/random
-			OD=`which od`
-			AWK=`which awk`
-			RND=""
-			if [ "" != "$OD" -a "" != "$AWK" ]; then
-				# Try /dev/urandom first
-				RAND=/dev/urandom
-				# If it doesn't exist try /dev/random
-				if [ ! -e "${RAND}" ]; then
-					RAND=/dev/urandom;
-				fi
-				# This makes sure we only try to read if one exists
-				if [ ! -e "${RAND}" ]; then
-					RND=$(head -1 ${RAND} | od -N 3 -t u | awk '{ print $2 }')
-				fi;
-			fi;
-
-			# No random number was generated, getting to here means that
-			# ${RANDOM} doesn't exist, /dev/random doesn't exist, /dev/urandom doesn't exist
-			# or that od/awk don't exist. Annoying.
-			# Try using this processes PID instead!
-			if [ "${RND}" = "" ]; then
-				RND=$$
-				DIR=${BASEDIR}${RND}
-				if [ -e "${DIR}" ]; then
-					# Lets hope this never happens.
-					errordialog "DMDirc Setup" "Unable to create random directory";
-					exit 0;
-				fi;
-			fi;
-		fi;
-		DIR=${BASEDIR}${RND}
-	done
-	mkdir ${DIR}
-	eval "$1=${DIR}"
-}
-
-uncompress() {
-#	DEBUGINFO="\n\nRunname: ${0}"
-#	DEBUGINFO="${DEBUGINFO}\nOldPwd: ${OLDPWD}"
-
-	# Try runname, in old dir.
-	FILE=${OLDPWD}/$0
-	if [ ! -e ${FILE} ]; then
-		# Else, try run filename in old dir
-		FILE=${OLDPWD}/`basename $0`
-		if [ ! -e ${FILE} ]; then
-			# Else try run name
-			FILE=$0
-			if [ ! -e ${FILE} ]; then
-				# Unable to find this file!
-				errordialog "DMDirc Setup" "Unable to find installer.\nThis shouldn't happen, please raise a bug report at http://bugs.dmdirc.com${DEBUGINFO}";
-				echo "Removing temp dir"
-				cd ${OLDPWD}
-				rm -Rf ${TEMPDIR}
-				exit 1;
-			fi;
-		fi;
-	fi;
-	echo "Decompressing: ${FILE}"
-#	DEBUGINFO="${DEBUGINFO}\nFile: ${FILE}"
-#	DEBUGINFO="${DEBUGINFO}\nCommand: tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>&1"
-	OUTPUT=`tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>&1`
-	if [ "${OUTPUT}" = "" ]; then
-		echo "Decompression failed."
-		errordialog "DMDirc Setup" "Decompression failed.\nThis shouldn't happen, please raise a bug report at http://bugs.dmdirc.com${DEBUGINFO}";
-		echo "Removing temp dir"
-		cd ${OLDPWD}
-		rm -Rf ${TEMPDIR}
-		exit 1;
-	fi;
-	echo "Decompression successful."
-}
-
-showHelp() {
-	echo "This will install DMDirc on a unix based system."
-	echo "The following command line arguments are known:"
-	echo "---------------------"
-	echo "-h, --help        Help information"
-	echo "-e, --extract     Extract .run file only, do not run setup.sh"
-#	echo "-s, --script      Don't use installer.jar (not implemented yet)"
-	echo "---------------------"
-	exit 0;
-}
-
-# Defaults
-extractOnly="false"
-setupParams=""
-skipMD5="false"
-
-# Begin
-echo "---------------------"
-echo "DMDirc Unix Setup"
-if [ "${isRelease}" != "" ]; then
-	echo "Version: "${isRelease};
-	setupParams="${setupParams} --release "${isRelease}
-fi;
-echo "---------------------"
-# Check for cmdline args
-while test -n "$1"; do
-	case "$1" in
-		--help|-h)
-			showHelp
-			;;
-		--extract|-e)
-			extractOnly="true"
-			;;
-		--script|-s)
-			setupParams="${setupParams} --script"
-			;;
-		--nomd5)
-			skipMD5="true"
-			;;
-	esac
-	shift
-done
-
-MD5BIN=`which md5sum`
-if [ "${MD5BIN}" = "" ]; then
-	MD5BIN=`which md5`
-fi;
-AWK=`which awk`
-getMD5() {
-	if [ "${MD5BIN}" != "" ]; then
-		echo "test" | ${MD5BIN} -
-		if [ $? -eq 0 ]; then
-			echo "Linux-Style MD5SUM: ${MD5BIN}"
-			getMD5Linux $@
-		else
-			echo "BSD-Style MD5SUM: ${MD5BIN}"
-			getMD5BSD $@
-		fi;
-	fi;
-}
-
-getMD5Linux() {
-	# Everything below the MD5SUM Line
-	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
-	MD5LINE=$((${MD5LINE%%:*} + 1))
-
-	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
-	return;
-}
-
-getMD5BSD() {
-	# Everything below the MD5SUM Line
-	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
-	MD5LINE=$((${MD5LINE%%:*} + 1))
-
-	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} | ${AWK} '{print $1}'`
-	return;
-}
-
-if [ "${MD5BIN}" != "" ]; then
-	if [ ${skipMD5} != "true" ]; then
-		#if [ -e "${0}.md5"  ]; then
-		#	echo "Checking MD5 using ${0}.md5.."
-		#	${MD5BIN} --check --status ${0}.md5
-		#	if [ $? = 0 ]; then
-		#		echo "MD5 Check Passed!"
-		#	else
-		#		ERROR="This copy of the DMDirc installer appears to be damaged and will now exit.";
-		#		ERROR=${ERROR}"\nYou may choose to skip this check and run it anyway by passing the --nomd5 parameter";
-		#		errordialog "DMDirc Setup: MD5 Check Failed!" "${ERROR}";
-		#		exit 1;
-		#	fi
-		#elif [ "${MD5}" != ""  ]; then
-		if [ "${MD5}" != ""  ]; then
-			echo "Checking MD5 using built in hash.."
-			if [ "${AWK}" != "" ]; then
-				MD5SUM=""
-				getMD5 ${0} ${MD5SUM}
-
-				echo "SUM obtained is: ${MD5SUM}"
-				echo "SUM expected is: ${MD5}"
-				if [ "${MD5SUM}" = "${MD5}" ]; then
-					echo "MD5 Check Passed!"
-				elif [ "${MD5SUM}" = "" -o "${MD5}" = "" ]; then
-					ERROR="The DMDirc installer is unable to verify the checksum of this download.";
-					if [ "${MD5SUM}" = "" ]; then
-						ERROR=${ERROR}"(Unable to calculate sum locally)";
-					else
-						ERROR=${ERROR}"(No checksum found in file)";
-					fi;
-					
-					ERROR=${ERROR}"\nDo you want to continue anyway?";
-					
-					questiondialog "DMDirc Setup: MD5 Check Failed!" "${ERROR}";
-					exit 1;
-				else
-					ERROR="This copy of the DMDirc installer appears to be damaged and will now exit.";
-					ERROR=${ERROR}"\nYou may choose to skip this check and run it anyway by passing the --nomd5 parameter";
-					errordialog "DMDirc Setup: MD5 Check Failed!" "${ERROR}";
-					exit 1;
-				fi;
-			else
-				echo "MD5 Check skipped (awk not found).."
-			fi;
-		else
-			#if [ "${MD5BIN}" = "" ]; then
-			#	echo "MD5 Check skipped (md5sum not found).."
-			#else
-				echo "MD5 Check skipped (No MD5 hash found to compare against).."
-			#fi
-		fi;
-	else
-		echo "MD5 Check skipped (Requested).."
-	fi
-fi;
-
-OLDPWD=${PWD}
-echo "Getting Temp Dir"
-random TEMPDIR
-echo "Got Temp Dir: ${TEMPDIR}"
-cd ${TEMPDIR}
-echo "Uncompressing to temp dir.."
-uncompress
-echo "Done."
-# Check if extract only was wanted.
-if [ "${extractOnly}" = "true" ]; then
-	echo "Extracted. (Files can be found in: ${TEMPDIR})"
-	exit 0;
-fi
-
-if [ -e "${TEMPDIR}/setup.sh" ]; then
-	echo "Running setup.."
-	chmod a+x ${TEMPDIR}/setup.sh
-	${TEMPDIR}/setup.sh ${setupParams}
-	echo ""
-	if [ $? -eq 0 ]; then
-		echo "Setup completed."
-	else
-		echo "Setup did not complete."
-	fi
-else
-	echo "No setup.sh found. This was pointless?"
-fi
-echo "Removing temp dir"
-cd ${OLDPWD}
-rm -Rf ${TEMPDIR}
-echo "Installation Completed."
-# Job Done!
-exit 0;
-###END STUB###

installer/linux/installjre.sh

@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# Install the JRE.
-#
-
-# Find out what params we should pass to things.
-# Solaris has a nice and ancient version of grep in /usr/bin
-grep -na "" /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	GREPOPTS="-n"
-else
-	GREPOPTS="-na"
-fi;
-# Solaris also has a crappy version of tail!
-tail -n +1 /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	TAILOPTS="+"
-else
-	TAILOPTS="-n +"
-fi;
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Find out where we are
-BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
-
-PIDOF=`which pidof`
-if [ "${PIDOF}" = "" ]; then
-	# For some reason some distros hide pidof...
-	if [ -e /sbin/pidof ]; then
-		PIDOF=/sbin/pidof
-	elif [ -e /usr/sbin/pidof ]; then
-		PIDOF=/usr/sbin/pidof
-	fi;
-fi;
-
-ISFREEBSD=`uname -s | grep -i FreeBSD`
-
-if [ -e "${BASEDIR}/functions.sh" ]; then
-	. ${BASEDIR}/functions.sh
-else
-	echo "Unable to find functions.sh, unable to continue."
-	exit 1;
-fi;
-
-showLicence() {
-	# Get Licence Text
-	FILE=`mktemp licence.XXXXXXXXXXXXXX`
-	if [ "${ISFREEBSD}" != "" ]; then
-		WGET=`which wget`
-		FETCH=`which fetch`
-		CURL=`which curl`
-		
-		ARCH=`uname -m`
-		RELEASE=`uname -r`
-		URL="http://www.dmdirc.com/getjavalicense/`uname -s`/${ARCH}/${RELEASE}"
-		
-		if [ "${WGET}" != "" ]; then
-			${WGET} -q -O ${FILE} ${URL}
-		elif [ "${FETCH}" != "" ]; then
-			${FETCH} -q -o ${FILE} ${URL}
-		elif [ "${CURL}" != "" ]; then
-			${CURL} -s -o ${FILE} ${URL}
-		fi;
-	else
-		# Location of licence start
-		STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
-		STARTLINE=$((${STARTLINE%%:*} + 1))
-		# Location of licence end
-		ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
-		ENDLINE=$((${ENDLINE%%:*} - 4))
-
-		if [ ${ENDLINE} -lt 4 ]; then
-			errordialog "Installer Error" "DMDirc has been unable to figure out what to do with this jre download and can not continue. Please raise an issue about this at http://bugs.dmdirc.com"
-			exit 1;
-		fi;
-
-		head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
-	fi;
-
-	# Send text to console.
-	echo ""
-	echo "-----------------------------------------------------------------------"
-	echo "Java Licence"
-	echo "-----------------------------------------------------------------------"
-	cat ${FILE}
-	echo "-----------------------------------------------------------------------"
-
-	# Now try to use the GUI Dialogs.
-	if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
-		echo "Dialog on Display: ${DISPLAY}"
-		${KDIALOG} --title "DMDirc: Java Licence" --textbox ${FILE} 600 400
-	elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-		echo "Dialog on Display: ${DISPLAY}"
-		${ZENITY} --text-info --title "DMDirc: Java Licence" --filename=${FILE} --width=600 --height=400
-	fi
-	
-	# Remove temp file
-	rm -Rf ${FILE}
-}
-
-
-if [ "" != "${1}" ]; then
-	questiondialog "Java Install" "${1}"
-	result=$?
-	if [ $result -ne 0 ]; then
-		exit 1;
-	fi;
-fi;
-
-messagedialog "Java Install" "Before java can be installed, please review the following licence."
-showLicence
-questiondialog "Java Install" "Do you agree to the Java Licence?"
-if [ $? -eq 0 ]; then
-	if [ "${ISFREEBSD}" != "" ]; then
-		JREJAVAHOME="diablo-jre1.6.0_07"
-	else
-		# Look to see where the JRE wants to install to
-		JREJAVAHOME=`grep ${GREPOPTS} "^javahome=" jre.bin`
-		JREJAVAHOME=${JREJAVAHOME##*=}
-	fi;
-	
-	echo "JREJAVAHOME: ${JREJAVAHOME}"
-	
-	if [ "${UID}" = "" ]; then
-		UID=`id -u`;
-	fi
-	if [ "0" = "${UID}" ]; then
-		mkdir -p /usr/lib/jvm/
-		installdir=/usr/lib/jvm/${JREJAVAHOME}
-	else
-		installdir=${HOME}/${JREJAVAHOME}
-	fi;
-	
-	echo "installdir: ${installdir}"
-	
-	if [ ! -e ${installdir} ]; then
-		messagedialog "Java Install" "Java install will begin when you press OK.\nThis may take some time, so please wait.\n\nYou will be informed when the installation is completed."
-		if [ "${ISFREEBSD}" != "" ]; then
-			mv jre.bin jre.tar.bz2
-			tar -jxvf jre.tar.bz2
-			mv jre.tar.bz2 jre.bin
-		else
-			# Hack jre.bin to allow us to install without asking for a licence, or failing
-			# the checksum.
-			
-			# Location of licence start
-			STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
-			STARTLINE=${STARTLINE%%:*}
-			# Location of licence end
-			ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
-			ENDLINE=$((${ENDLINE%%:*} - 2))
-			if [ ${ENDLINE} -lt 2 ]; then
-				errordialog "Installer Error" "DMDirc has been unable to figure out what to do with this jre download and can not continue. Please raise an issue about this at http://bugs.dmdirc.com"
-				exit 1;
-			fi;
-			# Location of checksum start
-			CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
-			CSSTARTLINE=${CSSTARTLINE%%:*}
-			# Location of checksum end
-			CSENDLINE=`grep ${GREPOPTS} "Can't find /usr/bin/sum to do checksum" jre.bin`
-			CSENDLINE=$((${CSENDLINE%%:*} + 2))
-			# Location of script end
-			SCENDLINE=`grep ${GREPOPTS} "^echo \"Done.\"$" jre.bin`
-			SCENDLINE=$((${SCENDLINE%%:*} + 2 - (${ENDLINE} - ${STARTLINE}) - (${CSENDLINE} - ${CSSTARTLINE})))
-			# Remove the licence and checksum stuff!
-			head -n $((${STARTLINE} -1)) jre.bin > jre.bin.tmp
-			tail ${TAILOPTS}$((${ENDLINE})) jre.bin | head -n $((${CSSTARTLINE} -1 - ${ENDLINE})) >> jre.bin.tmp
-			echo "tail \${tail_args} +${SCENDLINE} \"\$0\" > \$outname" >> jre.bin.tmp
-			tail ${TAILOPTS}$((${CSENDLINE})) jre.bin >> jre.bin.tmp
-
-			PIPE=`mktemp installprogresspipe.XXXXXXXXXXXXXX`
-			/bin/sh ${PWD}/progressbar.sh --pulsate "Installing JRE. Please wait.." 100 ${PIPE} &
-			sleep 1;
-			echo "-1" > ${PIPE}
-			# This is supposed to write to the pipe as it does stuff, but it appears
-			# not to work properly.
-			yes | sh jre.bin.tmp | egrep --line-buffered -i "(extracting|inflating):" > ${PIPE};
-			echo "quit" > ${PIPE}
-			# rm -Rf jre.bin.tmp
-		fi;
-		
-		mv ${JREJAVAHOME} ${installdir}
-
-		if [ "0" = "${UID}" ]; then
-			# Add to global path.
-			if [ -e "/usr/bin/java" ]; then
-				rm -Rf /usr/bin/java
-			fi;
-			ln -s /usr/lib/jvm/${JREJAVAHOME}/bin/java /usr/bin/java
-			
-			# This allows the main installer to continue with the new java version,
-			# incase the shell doesn't find the new binary.
-			echo "Adding java-bin: ${installdir}/bin/java -> ${PWD}/java-bin"
-			ln -s ${installdir}/bin/java ${PWD}/java-bin
-		else
-			# Add to path.
-			echo "" >> ${HOME}/.profile
-			echo "# set PATH so it includes user's private java if it exists" >> ${HOME}/.profile
-			echo "if [ -d ~/${JREJAVAHOME}/bin ] ; then" >> ${HOME}/.profile
-			echo "	PATH=~/${JREJAVAHOME}/bin:\${PATH}" >> ${HOME}/.profile
-			echo "fi" >> ${HOME}/.profile
-			
-			if [ -e ${HOME}/.cshrc ]; then
-				echo "" >> ${HOME}/.cshrc
-				echo "# set PATH so it includes user's private java if it exists" >> ${HOME}/.cshrc
-				echo "if( -d ~/${JREJAVAHOME}/bin ) then" >> ${HOME}/.cshrc
-				echo "	set path = (~/${JREJAVAHOME}/bin \$path)" >> ${HOME}/.cshrc
-				echo "endfi" >> ${HOME}/.cshrc
-			fi
-			
-			# This allows the main installer to continue with the new java version.
-			echo "Adding java-bin: ${installdir}/bin/java -> ${PWD}/java-bin"
-			ln -s ${installdir}/bin/java ${PWD}/java-bin
-			
-			# This allows dmdirc launcher to find the jre if the path is not set.
-			ln -sf ${installdir} ${HOME}/jre
-		fi;
-		
-		messagedialog "Java Install" "Java installation complete"
-		exit 0;
-	else
-		messagedialog "Java Install" "An existing install was found at ${installdir}, but this directory is not in the current path, DMDirc setup will try to use this version of java for the install."
-		echo "Adding java-bin: ${installdir}/bin/java -> ${PWD}/java-bin"
-		ln -s ${installdir}/bin/java ${PWD}/java-bin
-		exit 0;
-	fi;
-else
-	errordialog "Java Install" "You must agree to the licence before java can be installed"
-fi;
-exit 1;

installer/linux/makeInstallerLinux.sh

@@ -1,437 +0,0 @@
-#!/bin/sh
-#
-# This script generates a .run file that will install DMDirc
-#
-# DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Final Name of the installer (without file extention)
-INSTALLERNAME=DMDirc-Setup
-# full name of the file to output to
-RUNNAME="${PWD}/${INSTALLERNAME}.run"
-
-# Find out what params we should pass to things.
-# Solaris has a nice and ancient version of grep in /usr/bin
-grep -na "" /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	GREPOPTS="-n"
-else
-	GREPOPTS="-na"
-fi;
-# Solaris also has a crappy version of tail!
-tail -n +1 /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	TAILOPTS="+"
-else
-	TAILOPTS="-n +"
-fi;
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Compress stuff!
-compress() {
-	tar cvfh - $@ | gzip - 2>/dev/null >>${RUNNAME} || {
-		echo "Compression failed."
-		kill -15 $$;
-	};
-}
-
-WGET=`which wget`
-FETCH=`which fetch`
-CURL=`which curl`
-getFile() {
-	URL=${1}
-	OUTPUT=${2}
-
-	if [ "${WGET}" != "" ]; then
-		${WGET} -O ${OUTPUT} ${URL}
-	elif [ "${FETCH}" != "" ]; then
-		${FETCH} -o ${OUTPUT} ${URL}
-	elif [ "${CURL}" != "" ]; then
-		${CURL} -o ${OUTPUT} ${URL}
-	fi;
-}
-
-# Go!
-echo "-----------"
-if [ -e "${RUNNAME}" ]; then
-	echo "Removing existing .run file"
-	rm -Rf ./*.run
-fi
-
-showHelp() {
-	echo "This will generate a DMDirc installer for a unix based system."
-	echo "The following command line arguments are known:"
-	echo "---------------------"
-	echo "-h, --help                Help information"
-	echo "-b, --branch              Release in -r is a branch "
-	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
-	echo "-c, --compile             Recompile the .jar file"
-	echo "    --jre                 Include the JRE in this installer"
-	echo "    --jre64               Include the 64-Bit JRE in this installer"
-	echo "    --jar <file>          use <file> as DMDirc.jar"
-	echo "    --current             Use the current folder as the base for the build"
-	echo "-e, --extra <tag>         Tag to add to final exe name to distinguish this build from a standard build"
-	echo "---------------------"
-	exit 0;
-}
-
-# Check for some CLI params
-compileJar="false"
-isRelease=""
-finalTag=""
-BRANCH="0"
-plugins=""
-location="../../"
-current="1"
-jarfile=""
-jre=""
-jrename="jre" # Filename for JRE without the .bin
-TAGGED=""
-while test -n "$1"; do
-	case "$1" in
-		--plugins|-p)
-			shift
-			plugins=${1}
-			;;
-		--jar)
-			shift
-			jarfile=${1}
-			;;
-		--jre)
-			jre="http://www.dmdirc.com/getjava/linux/i686"
-			;;
-		--jre64)
-			jre="http://www.dmdirc.com/getjava/linux/x86_64"
-			jrename="jre64"
-			;;
-		--current)
-			location="../../"
-			current="1"
-			;;
-		--compile|-c)
-			compileJar="true"
-			;;
-		--release|-r)
-			shift
-			isRelease=${1}
-			;;
-		--extra|-e)
-			shift
-			finalTag=${1}
-			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.run"
-			;;
-		--help|-h)
-			showHelp;
-			;;
-		--branch|-b)
-			BRANCH="1"
-			;;
-		--tag|-t)
-			TAGGED=`git describe --tags`
-			TAGGED=${TAGGED%%-*}
-			;;
-	esac
-	shift
-done
-if [ "" = "${current}" ]; then
-	jarPath="${location}trunk"
-else
-	jarPath="${location}"
-fi
-
-if [ "" = "${jarfile}" ]; then
-	jarfile=${jarPath}"/dist/DMDirc.jar"
-	if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
-		echo "Creating jar.."
-		OLDPWD=${PWD}
-		cd ${jarPath}
-
-		rm -Rf build dist
-		ant jar
-		if [ ! -e "dist/DMDirc.jar" ]; then
-			echo "There was an error creating the .jar file. Aborting."
-			exit 1;
-		fi;
-		cd ${OLDPWD}
-	fi;
-elif [ ! -e "${jarfile}" ]; then
-	echo "Requested Jar file (${jarfile}) does not exist."
-	exit 1;
-fi;
-
-if [ "" = "${plugins}" ]; then
-	echo "Linking jar (${jarfile}).."
-	ln -sf ${jarfile} "./DMDirc.jar"
-else
-	echo "Copying jar (${jarfile}).."
-	cp ${jarfile} "./DMDirc.jar"
-
-	echo "Adding plugins to jar"
-	ln -sf ${jarPath}"/plugins"
-	pluginList=""
-	for plugin in ${plugins}; do
-		pluginList=${pluginList}" plugins/${plugin}"
-	done
-	jar -uvf "DMDirc.jar" ${pluginList}
-
-        ../../updateBundledPlugins.sh "DMDirc.jar";
-	rm -Rf plugins;
-fi
-
-echo "Creating .run file"
-echo "Adding stub.."
-
-grep -na "" /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	GREPOPTS="-n"
-else
-	GREPOPTS="-na"
-fi;
-# Solaris also has a crappy version of tail!
-tail -n +1 /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	TAILOPTS="+"
-else
-	TAILOPTS="-n +"
-fi;
-
-FUNCTIONSLINE=`grep ${GREPOPTS} "^\s*###FUNCTIONS_FILE###\s*$" installerstub.sh`
-FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
-
-head -n ${FUNCTIONSLINE} installerstub.sh  > ${RUNNAME}
-cat functions.sh >> ${RUNNAME}
-echo "" >> ${RUNNAME}
-tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) installerstub.sh >> ${RUNNAME}
-
-# Add release info.
-awk '{gsub(/###ADDITIONAL_STUFF###/,"isRelease=\"'${TAGGED}'\"");print}' ${RUNNAME} > ${RUNNAME}.tmp
-mv ${RUNNAME}.tmp ${RUNNAME}
-
-FILES="DMDirc.jar";
-echo "Compressing files.."
-for FILE in "getjre.sh" "installjre.sh" "progressbar.sh" "functions.sh"; do
-	if [ -e "${FILE}" ]; then
-		FILES="${FILES} ${FILE}"
-	fi
-done;
-
-if [ "" != "${jre}" ]; then
-	if [ ! -e "../common/${jrename}.bin" ]; then
-		echo "Downloading JRE to include in installer"
-		getFile "${jre}" "../common/${jrename}.bin"
-	fi
-	ln -sf ../common/${jrename}.bin jre.bin
-	FILES="${FILES} jre.bin"
-fi;
-
-if [ -e "setup.sh" ]; then
-	FILES="${FILES} setup.sh"
-else
-	echo "[WARNING] Creating setup-less archive. This will just extract and immediately delete the .jar file unless the -e flag is used"
-fi
-
-#if [ -e "../common/installer.jar" ]; then
-#	ln -sf ../common/installer.jar ./installer.jar
-#	FILES="${FILES} installer.jar"
-#else
-#	echo "[WARNING] Creating installer-less archive - relying on setup.sh"
-#fi
-
-if [ -e ${jarPath}"/src/com/dmdirc/res/source/logo.svg" ]; then
-	ln -sf ${jarPath}"/src/com/dmdirc/res/source/logo.svg" ./icon.svg
-	FILES="${FILES} icon.svg"
-fi
-
-if [ "${isRelease}" != "" ]; then
-	DOCSDIR=${jarPath}
-else
-	DOCSDIR="../common"
-fi
-
-if [ -e "${DOCSDIR}/README.TXT" ]; then
-	ln -sf "${DOCSDIR}/README.TXT" .
-	FILES="${FILES} README.TXT"
-fi
-
-if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
-	ln -sf "${DOCSDIR}/CHANGES.TXT" .
-	FILES="${FILES} CHANGES.TXT"
-elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
-	ln -sf "${DOCSDIR}/CHANGELOG.TXT" .
-	FILES="${FILES} CHANGELOG.TXT"
-fi
-
-if [ -e "${jarPath}/launcher/unix" ]; then
-	# Hax in functions.sh
-	FUNCTIONSFILE="functions.sh"
-	SRCFILE=${jarPath}/launcher/unix/DMDirc.sh
-	DESTFILE=./DMDirc.sh
-
-	if [ -e "${FUNCTIONSFILE}" ]; then
-		FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" ${SRCFILE}`
-		if [ "${FUNCTIONSLINE}" == "" ]; then
-			echo "    Functions already built into launcher."
-			cp ${SRCFILE} ${DESTFILE}
-		else
-			echo "    Including functions.sh into launcher."
-			FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
-
-			head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
-			cat ${FUNCTIONSFILE} >> ${DESTFILE}
-			echo "" >> ${DESTFILE}
-			tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
-		fi;
-	else
-		echo "    Unable to create unix launcher update, no functions.sh found."
-	fi;
-	
-	FILES="${FILES} DMDirc.sh"
-fi
-
-if [ -e "uninstall.sh" ]; then
-	FILES="${FILES} uninstall.sh"
-fi
-
-compress $FILES
-
-MD5BIN=`which md5sum`
-if [ "${MD5BIN}" = "" ]; then
-	MD5BIN=`which md5`
-fi;
-AWK=`which awk`
-getMD5() {
-	if [ "${MD5BIN}" != "" ]; then
-		echo "test" | ${MD5BIN} -
-		if [ $? -eq 0 ]; then
-			echo "Linux-Style MD5SUM: ${MD5BIN}"
-			getMD5Linux $@
-		else
-			echo "BSD-Style MD5SUM: ${MD5BIN}"
-			getMD5BSD $@
-		fi;
-	fi;
-}
-
-getMD5Linux() {
-	# Everything below the MD5SUM Line
-	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
-	MD5LINE=$((${MD5LINE%%:*} + 1))
-
-	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
-	return;
-}
-
-getMD5BSD() {
-	# Everything below the MD5SUM Line
-	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
-	MD5LINE=$((${MD5LINE%%:*} + 1))
-
-	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} | ${AWK} '{print $1}'`
-	return;
-}
-
-if [ "${MD5BIN}" != "" -a "${AWK}" != "" ]; then
-	echo "Adding MD5.."
-
-	MD5SUM=""
-	getMD5 ${RUNNAME} ${MD5SUM}
-
-	echo "SUM obtained is: ${MD5SUM}"
-
-	LINENUM=`grep ${GREPOPTS} "^MD5=\"\"$" ${RUNNAME}`
-	LINENUM=${LINENUM%%:*}
-
-	head -n $((${LINENUM} -1)) ${RUNNAME} > ${RUNNAME}.tmp
-	echo 'MD5="'${MD5SUM}'"' >> ${RUNNAME}.tmp
-	tail ${TAILOPTS}$((${LINENUM} +1)) ${RUNNAME} >> ${RUNNAME}.tmp
-	mv ${RUNNAME}.tmp ${RUNNAME}
-else
-	echo "Not Adding MD5.."
-fi;
-
-echo "Chmodding"
-chmod a+x ${RUNNAME}
-
-doRename=0
-if [ "${TAGGED}" != "" ]; then
-	doRename=1	
-fi;
-
-if [ ${doRename} -eq 1 ]; then
-	if [ "${TAGGED}" = "" ]; then
-		isRelease=branch-${isRelease}
-	else
-		isRelease=${TAGGED}
-	fi;
-	if [ "" != "${finalTag}" ]; then
-		finalTag="-${finalTag}"
-	fi;
-	finalname=DMDirc-${isRelease}-Setup${finalTag}.run
-else
-	finalname=${RUNNAME##*/}
-fi;
-
-if [ "" != "${jre}" ]; then
-	finalname=`echo ${finalname} | sed "s/.run$/.${jrename}.run/"`
-fi;
-
-mv ${RUNNAME} ../output/${finalname}
-mv setup.sh setup.sh.tmp
-mv getjre.sh getjre.sh.tmp
-mv installjre.sh installjre.sh.tmp
-mv progressbar.sh progressbar.sh.tmp
-mv uninstall.sh uninstall.sh.tmp
-mv functions.sh functions.sh.tmp
-rm -f ${FILES}
-mv setup.sh.tmp setup.sh
-mv getjre.sh.tmp getjre.sh
-mv installjre.sh.tmp installjre.sh
-mv progressbar.sh.tmp progressbar.sh
-mv uninstall.sh.tmp uninstall.sh
-mv functions.sh.tmp functions.sh
-
-echo "-----------"
-echo "Done."
-echo "-----------"
-
-# and Done \o
-exit 0;

installer/linux/progressbar.sh

@@ -1,325 +0,0 @@
-#!/bin/sh
-#
-# Show a progress bar.
-#
-# If kdialog/zenity are available they are used.
-# Progress data is read from the created pipe, echoing "quit" to the pipe will 
-# cause the script to terminate, as will the progress reaching 100%
-#
-# Pressing cancel on a zenity dialog will terminate right away, kdialog will
-# only terminate when the next line of data is read from the pipe.
-#
-
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-# Solaris also has a crappy version of tail!
-tail -n +1 /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	TAILOPTS="-"
-else
-	TAILOPTS="-n"
-fi;
-
-PIDOF=`which pidof`
-if [ "${PIDOF}" = "" ]; then
-	# For some reason some distros hide pidof...
-	if [ -e /sbin/pidof ]; then
-		PIDOF=/sbin/pidof
-	elif [ -e /usr/sbin/pidof ]; then
-		PIDOF=/usr/sbin/pidof
-	fi;
-fi;
-
-## Helper Functions
-if [ -n "${PIDOF}" ]; then
-	ISKDE=`${PIDOF} -x -s kdeinit kdeinit4`
-	ISGNOME=`${PIDOF} -x -s gnome-panel`
-else
-	ISKDE=`pgrep kdeinit`
-	ISGNOME=`pgrep gnome-panel`
-fi;
-
-KDIALOG=`which kdialog`
-ZENITY=`which zenity`
-USEKDIALOG="0";
-QDBUS=`which qdbus`
-DBUSSEND=`which dbus-send`
-DCOP=`which dcop`
-BC=`which bc`
-KDETYPE=""
-if [ "${ISKDE}" != "" -o "${ZENITY}" = "" ]; then
-	# Check to see if we have the dcop or dbus binaries needed..
-	USEDCOP=`kdialog --help | grep -i dcop`
-	if [ "${USEDCOP}" != "" -a "${DCOP}" != "" ]; then
-		KDETYPE="dcop"
-		USEKDIALOG="1";
-	elif [ "${USEDCOP}" = "" -a "${QDBUS}" != "" ]; then
-		KDETYPE="qdbus"
-		USEKDIALOG="1";
-	elif [ "${USEDCOP}" = "" -a "${DBUSSEND}" != "" ]; then
-		KDETYPE="dbussend"
-		USEKDIALOG="1";
-	fi;
-fi;
-
-# Check for special watchdog mode.
-# In this mode we are used to kill ourself after a certain time limit to make sure we don't hang.
-if [ "${1}" = "--watchdog" ]; then
-	if [ "" != "${2}" ]; then
-		echo "Watchdog for: ${2}"
-		sleep 5;
-		kill -1 ${2} >/dev/null 2>&1 &
-		sleep 5;
-		kill -9 ${2} >/dev/null 2>&1 &
-		exit 0;
-	else
-		echo "No PID specified to watch."
-		exit 1;
-	fi;
-
-	exit 1;
-fi;
-
-if [ "${1}" = "--pulsate" ]; then
-	shift;
-	PULSATE="1"
-else
-	PULSATE="0"
-fi;
-
-CAPTION=${1}
-FILESIZE=${2}
-WGETPID=${4}
-progresswindow=""
-TYPE=""
-PIPE="progresspipe_${$}"
-retval="1"
-CONTINUE="1"
-
-readprogress() {
-	data=""
-	input=""
-	while [ ${CONTINUE} -eq "1" -a -e ${PIPE} ]; do
-		if [ "${TYPE}" = "KDE" ]; then
-			wasCancelled="false"
-			if [ "${KDETYPE}" = "dcop" ]; then
-				wasCancelled=`${DCOP} ${progresswindow} wasCancelled`;
-			elif [ "${KDETYPE}" = "qdbus" ]; then
-				wasCancelled=`${QDBUS} ${progresswindow} org.kde.kdialog.ProgressDialog.wasCancelled`;
-			elif [ "${KDETYPE}" = "dbussend" ]; then
-				wasCancelled=`${DBUSSEND} --print-reply --dest=${progresswindow} org.kde.kdialog.ProgressDialog.wasCancelled | grep boolean | awk '{print $2}'`;
-			fi
-			if [ "${wasCancelled}" = "true" ]; then
-				touch .downloadWasCancelled
-				break;
-			fi;
-		fi;
-		
-		input=`cat "${PIPE}" | tail ${TAILOPTS}1`
-		if [ "${input}" = "quit" ]; then
-			break;
-		elif [ "${input}" != "" ]; then
-			data=${input}
-			input=""
-			if [ "${PULSATE}" = "1" ]; then
-				val=-1
-				
-				if [ "${data}" != "-1" ]; then
-					if [ "${TYPE}" = "KDE" ]; then
-						if [ "${KDETYPE}" = "dcop" ]; then
-							${DCOP} ${progresswindow} setLabelText "${data}"
-						elif [ "${KDETYPE}" = "qdbus" ]; then
-							${QDBUS} ${progresswindow} org.kde.kdialog.ProgressDialog.setLabelText "${data}"
-						elif [ "${KDETYPE}" = "dbussend" ]; then
-							${DBUSSEND} --print-reply --dest=${progresswindow} org.kde.kdialog.ProgressDialog.setLabelText "string:\'${data}\'" > /dev/null
-						fi;
-					elif [ "${TYPE}" = "GNOME" ]; then
-						echo "${data}" | sed 's/^/# /g'
-					else
-						echo "${data}"
-					fi;
-				fi;
-				
-			else
-				if [ "${BC}" != "" ]; then
-					res=`echo "scale=4 ; (${data}/${FILESIZE})*100" | bc`;
-				else
-					# Note, this will return 0 or 100, nothing else, better than spamming
-					# errors and never closing tho.
-					res=`echo $(( (${data}/${FILESIZE})*100 ))`;
-				fi;
-				val=${res%%.*}
-				if [ "${val}" = "" ]; then
-					val=0
-				fi;
-			fi;
-			if [ "${TYPE}" = "KDE" ]; then
-				if [ "${KDETYPE}" = "dcop" ]; then
-					${DCOP} ${progresswindow} setProgress ${val}
-					returnVal=${?}
-				elif [ "${KDETYPE}" = "qdbus" ]; then
-					${QDBUS} ${progresswindow} org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog value ${val}
-					returnVal=${?}
-				elif [ "${KDETYPE}" = "dbussend" ]; then
-					${DBUSSEND} --print-reply --dest=${progresswindow} org.freedesktop.DBus.Properties.Set string:'org.kde.kdialog.ProgressDialog' string:'value' variant:int32:${val} > /dev/null
-					returnVal=${?}
-				fi;
-				
-				if [ ${returnVal} -ne 0 ]; then
-					break;
-				fi;
-			elif [ "${TYPE}" = "GNOME" ]; then
-				echo ${val}
-				if [ $? -ne 0 ] ; then
-					break;
-				fi
-			else
-				if [ $((${val} % 2)) -eq 0 ]; then
-					echo "-> "${val}"%"
-				fi;
-			fi;
-			if [ "${val}" = "100" ]; then
-				retval="0"
-				CONTINUE="0"
-				break;
-			fi;
-		fi;
-	done;
-}
-
-if [ "" = "${CAPTION}" -o "" = "${FILESIZE}" ]; then
-	echo "Insufficient Parameters."
-	echo "Usage: ${0} <caption> <totalvalue> [pipename]"
-	exit;
-fi;
-
-if [ "" != "${3}" ]; then
-	# Assume pipe name is what we want, delete existing file.
-	PIPE=${3}
-	rm -Rf ${PIPE}
-else
-	# Make sure we get a file that doesn't already exist, keep appending our
-	# pid untill we get a file that hasn't been taken.
-	while [ -e "${PIPE}" ]; do
-		PIPE="${PIPE}_${$}"
-	done;
-fi;
-
-echo "Using pipe: "${PIPE}
-mkfifo "${PIPE}"
-EMPTYPIPE="1"
-WDPID=""
-WD2PID=""
-closeProgress() {
-	CONTINUE="0"
-	if [ "${TYPE}" = "KDE" -a ${retval} != "0" ]; then
-		if [ "${KDETYPE}" = "dcop" ]; then
-			${DCOP} ${progresswindow} close
-		elif [ "${KDETYPE}" = "qdbus" ]; then
-			${QDBUS} ${progresswindow} org.kde.kdialog.ProgressDialog.close
-		elif [ "${KDETYPE}" = "dbussend" ]; then
-			${DBUSSEND} --print-reply --dest=${progresswindow} org.kde.kdialog.ProgressDialog.close > /dev/null
-		fi;
-	fi;
-	echo "Exiting with value: $retval"
-	if [ "${WGETPID}" != "" ]; then
-		echo "Attempting to kill wget (${WGETPID})"
-		kill -9 ${WGETPID}
-	fi;
-	
-	if [ -e ${PIPE} ]; then
-		if [ "${EMPTYPIPE}" = "1" ]; then
-			sh ${0} --watchdog ${$} &
-			WDPID=${!}
-		
-			EMPTYPIPE="2"
-			echo "Emptying pipe (${PIPE}) this may hang if no data has been written to the pipe."
-			cat ${PIPE};
-		elif [ "${EMPTYPIPE}" = "2" ]; then
-			echo "Helping pipe (${PIPE}) this may hang if nothing is reading from the pipe."
-			sh ${0} --watchdog ${$} &
-			WD2PID=${!}
-			EMPTYPIPE="3"
-			echo "." > ${PIPE};
-		else
-			echo "Ignoring Pipe..."
-		fi;
-		echo "Killing watchdog 1."
-		kill -9 ${WDPID}
-		echo "Killing watchdog 2."
-		kill -9 ${WD2PID}
-		echo "Deleting Pipe ${PIPE}"
-		rm -Rf "${PIPE}"
-	fi;
-	exit $retval;
-}
-trap 'closeProgress' INT TERM EXIT
-
-rm .downloadWasCancelled
-
-# if kdialog exists, and we have a display, and we are not running gnome,
-# and either we are running kde or zenity doesn't exist..
-if [ "" != "${KDIALOG}" -a "" != "${DISPLAY}" -a "" = "${ISGNOME}" -a "${USEKDIALOG}" = "1" ]; then
-	echo "Progress dialog on Display: ${DISPLAY}"
-	progresswindow=`${KDIALOG} --title "DMDirc: ${CAPTION}" --progressbar "${CAPTION}" 100`
-	if [ "${PULSATE}" = "1" ]; then
-		SHOWCANCEL="false"
-	else
-		SHOWCANCEL="true"
-	fi;
-	if [ "${KDETYPE}" = "dcop" ]; then
-		${DCOP} ${progresswindow} setAutoClose true
-		${DCOP} ${progresswindow} showCancelButton ${SHOWCANCEL}
-	elif [ "${KDETYPE}" = "qdbus" ]; then
-		${QDBUS} ${progresswindow} org.freedesktop.DBus.Properties.Set org.kde.kdialog.ProgressDialog autoClose true
-		${QDBUS} ${progresswindow} org.kde.kdialog.ProgressDialog.showCancelButton ${SHOWCANCEL}
-	elif [ "${KDETYPE}" = "dbussend" ]; then
-		${DBUSSEND} --print-reply --dest=${progresswindow} org.kde.kdialog.ProgressDialog.showCancelButton boolean:${SHOWCANCEL} >/dev/null
-		${DBUSSEND} --print-reply --dest=${progresswindow} org.freedesktop.DBus.Properties.Set string:'org.kde.kdialog.ProgressDialog' string:'autoClose' variant:boolean:true > /dev/null
-	fi;
-	TYPE="KDE"
-	readprogress
-	CONTINUE="0"
-	echo "Progress Bar Complete"
-elif [ "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-	# Else, if zenity exists and we have a display
-	echo "Progress dialog on Display: ${DISPLAY}"
-	TYPE="GNOME"
-	if [ "${PULSATE}" = "1" ]; then
-		readprogress | ${ZENITY} --progress --pulsate --auto-close --title "DMDirc: ${CAPTION}" --text "${CAPTION}"
-	else
-		readprogress | ${ZENITY} --progress --auto-close --auto-kill --title "DMDirc: ${CAPTION}" --text "${CAPTION}"
-	fi;
-	CONTINUE="0"
-	echo "Progress Bar Complete"
-else
-	# Else, basic command-line progress
-	echo "Progress For: ${CAPTION}"
-	echo "-> 0%"
-	readprogress
-	CONTINUE="0"
-	echo ""
-	echo "Finished!"
-fi
-echo "Exiting progressbar"
-exit 0;

installer/linux/setup.sh

@@ -1,248 +0,0 @@
-#!/bin/sh
-#
-# This script launches the dmdirc java-based installer.
-#
-# DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Find out where we are
-BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
-
-PIDOF=`which pidof`
-if [ "${PIDOF}" = "" ]; then
-	# For some reason some distros hide pidof...
-	if [ -e /sbin/pidof ]; then
-		PIDOF=/sbin/pidof
-	elif [ -e /usr/sbin/pidof ]; then
-		PIDOF=/usr/sbin/pidof
-	fi;
-fi;
-
-if [ -e "${BASEDIR}/functions.sh" ]; then
-	. ${BASEDIR}/functions.sh
-else
-	echo "Unable to find functions.sh, unable to continue."
-	exit 1;
-fi;
-
-UNAME=`uname -a`
-
-# Store params so that we can pass them back to ourself if needed.
-for param in "$@"; do
-	PSN=`echo "${param}" | grep "^-psn_"`
-	if [ "" = "${PSN}" ]; then
-		SPACE=`echo "${param}" | grep " "`
-		if [ "${SPACE}" != "" ]; then
-			niceParam=`echo "${param}" | sed 's/"/\\\\"/g'`
-			params=${params}" \"${niceParam}\""
-		else
-			params=${params}" ${param}"
-		fi;
-	fi;
-done;
-
-# Check for some CLI params
-isRelease=""
-USEPROFILE=1;
-while test -n "$1"; do
-	case "$1" in
-		--release|-r)
-			shift
-			isRelease=${1}
-			;;
-		--help|-h)
-			showHelp;
-			;;
-		--noprofile)
-			USEPROFILE=0;
-			;;
-	esac
-	shift;
-done
-
-relaunch() {
-	trap - INT TERM EXIT
-	echo ""
-	echo "============================================================="
-	echo "ERROR"
-	echo "============================================================="
-	echo "${HOME}/.profile has errors in it (or an 'exit' command)."
-	echo "Setup will now restart with the --noprofile option."
-	echo "============================================================="
-	sh ${0} ${params} --noprofile
-}
-
-echo ""
-echo "---------------------"
-echo "Setup.sh"
-echo "---------------------"
-echo -n "Looking for java.. ";
-# Location where ports on FreeBSD/PCBSD installs java6
-# check it first, because it isn't added to the path automatically
-JAVA="/usr/local/jdk1.6.0/jre/bin/java"
-if [ ! -e "${JAVA}" ]; then
-	# Try alternative BSD Location
-	JAVA="/usr/local/diablo-jdk1.6.0/jre/bin/java"
-	if [ ! -e "${JAVA}" ]; then
-		# Look in path
-		if [ -e "${HOME}/.profile" -a "${USEPROFILE}" = "1" ]; then
-			# Source the profile incase java can't be found otherwise
-			# First, lets add a nice handler for the script exiting because of this crap.
-			trap relaunch INT TERM EXIT
-			. ${HOME}/.profile
-			trap - INT TERM EXIT
-		fi;
-		JAVA=`which java`
-	fi
-fi
-
-installjre() {
-	result=1
-	if [ ! -e "jre.bin" ]; then
-		message="Would you like to download and install java?"
-		if [ "install" = "${1}" ]; then
-			message="Java was not detected on your machine. Would you like to download and install it now?" 
-		elif [ "upgrade" = "${1}" ]; then
-			message="The version of java detected on your machine is not compatible with DMDirc. Would you like to download and install a compatible version now?"
-		fi;
-		/bin/sh getjre.sh "${message}"
-		if [ $? -eq 0 ]; then
-			/bin/sh installjre.sh
-			result=$?
-		fi;
-	else
-		message="Would you like to install java?"
-		if [ "install" = "${1}" ]; then
-			message="Java was not detected on your machine. Would you like to install it now?" 
-		elif [ "upgrade" = "${1}" ]; then
-			message="The version of java detected on your machine is not compatible with DMDirc. Would you like to install a compatible version now?"
-		fi;
-		/bin/sh installjre.sh  "${message}"
-		result=$?
-	fi;
-	if [ ${result} -ne 0 ]; then
-		if [ "upgrade" = "${1}" ]; then
-			errordialog "DMDirc Setup" "Sorry, DMDirc setup can not continue without an updated version of java."
-		else
-			errordialog "DMDirc Setup" "Sorry, DMDirc setup can not continue without java."
-		fi;
-		exit 1;
-	else
-		if [ -e "${PWD}/java-bin" ]; then
-			echo "Found JREBin: ${PWD}/java-bin"
-			JAVA="${PWD}/java-bin"
-		else
-			JAVA=`which java`
-		fi;
-	fi;
-}
-
-if [ "" != "${JAVA}" ]; then
-	echo "Success! ("${JAVA}")"
-else
-	echo "Failed!"
-	installjre "install"
-fi
-
-echo "Success!"
-
-if [ "${UID}" = "" ]; then
-	UID=`id -u`;
-fi
-if [ "0" = "${UID}" ]; then
-	echo "Running as root.."
-	isRoot="--isroot";
-else
-	echo "Running as user.."
-	isRoot="";
-fi
-
-showHelp() {
-	echo "This will setup DMDirc on a unix based system."
-	echo "The following command line arguments are known:"
-	echo "---------------------"
-	echo "-h, --help                Help information"
-	echo "-r, --release [version]   This is a release"
-	echo "---------------------"
-	exit 0;
-}
-
-if [ "${isRelease}" != "" ]; then
-	isRelease=" --release "${isRelease}
-fi
-
-if [ -e "DMDirc.jar" ]; then
-	echo "Checking for openJDK.."
-	ISOPENJDK=`${JAVA} -version 2>&1 | grep -i openjdk`
-	if [ "" != "${ISOPENJDK}" ]; then
-		message="The DMDirc installer has detected that you are using OpenJDK. There are currently known issues with some versions of OpenJDK and DMDirc. To ensure DMDirc runs optimally we recommend you use the Sun JRE."
-		message="${message}\n\nWould you like to continue anyway?"
-		questiondialog "OpenJDK" "${message}" 0
-		if [ $? -ne 0 ]; then
-			echo "Aborting."
-			exit 1;
-		fi;
-	fi;
-	
-	echo "Checking java version.."
-	${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main --help >/dev/null
-	if [ $? -ne 0 ]; then
-		installjre "upgrade"
-		echo "Trying to run installer.."
-		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
-		if [ $? -ne 0 ]; then
-			exit 1;
-		fi;
-	else
-		echo "Running installer.."
-		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
-		exit $?
-	fi
-else
-	echo "No installer found!"
-fi
-
-## Script-Only install goes here.
-echo "Script-Only functionality not implemented."
-exit 1;

installer/linux/uninstall.sh

@@ -1,141 +0,0 @@
-#!/bin/sh
-
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Find out where we are
-BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
-
-if [ ! -e ${BASEDIR}/.uninstall.conf ]; then
-	echo "No .uninstall.conf found, unable to continue."
-	exit 1;
-else
-	INSTALLED_AS_ROOT=""
-	INSTALL_LOCATION=""
-	
-	. ${BASEDIR}/.uninstall.conf
-
-	if [ "${INSTALL_LOCATION}" = "" ]; then
-		echo "Unable to read .uninstall.conf, unable to continue."
-		exit 1;
-	fi;
-fi;
-
-PIDOF=`which pidof`
-if [ -z "${PIDOF}" ]; then
-	# For some reason some distros hide pidof...
-	if [ -e /sbin/pidof ]; then
-		PIDOF=/sbin/pidof
-	elif [ -e /usr/sbin/pidof ]; then
-		PIDOF=/usr/sbin/pidof
-	fi;
-fi;
-
-JAVA=`which java`
-
-if [ -e "${BASEDIR}/functions.sh" ]; then
-	. ${BASEDIR}/functions.sh
-else
-	echo "Unable to find functions.sh, unable to continue."
-	exit 1;
-fi;
-
-if [ "${INSTALLED_AS_ROOT}" -eq 1 ]; then
-	USER=`whoami`
-	if [ "${USER}" != "root" ]; then
-		errordialog "Uninstaller" "Uninstall Aborted. Only root can use this script"
-		exit 1;
-	fi
-fi
-
-questiondialog "Uninstaller" "Are you sure you want to uninstall DMDirc?"
-if [ $? -ne 0 ]; then
-	messagedialog "Uninstaller" "Uninstall Aborted."
-	echo "Uninstall Aborted"
-	exit 1;
-fi
-
-${JAVA} -jar ${INSTALL_LOCATION}/DMDirc.jar -k
-
-if [ $? -eq 0 ]; then
-	errordialog "Uninstaller" "Uninstall Aborted - DMDirc is still running. Please close DMDirc before continuing"
-	echo "Uninstall Aborted - DMDirc already running."
-	exit 1;
-fi
-
-echo "Uninstalling DMDirc"
-echo "Removing Shortcuts.."
-
-TOOL=`which gconftool-2`
-COMMAND=""
-FILENAME=""
-if [ "${INSTALLED_AS_ROOT}" -eq 1 ]; then
-	COMMAND="${TOOL} --config-source=`${TOOL} --get-default-source`"
-	FILENAME="/usr/share/services/irc.protocol"
-	rm -Rfv /usr/share/applications/DMDirc.desktop
-else
-	COMMAND="${TOOL}"
-	FILENAME="${HOME}/.kde/share/services/irc.protocol"
-	rm -Rfv ${HOME}/.local/share/applications/DMDirc.desktop
-	rm -Rfv ${HOME}/Desktop/DMDirc.desktop
-fi;
-
-if [ "${TOOL}" != "" ]; then
-	CURRENT=`${COMMAND} --get /desktop/gnome/url-handlers/irc/command`
-	if [ "${CURRENT}" = "\"${INSTALL_LOCATION}/DMDirc.sh\" -e -c %s" ]; then
-		echo "Removing Gnome Protocol Handler"
-		${COMMAND} --unset /desktop/gnome/url-handlers/irc/enabled
-		${COMMAND} --unset /desktop/gnome/url-handlers/irc/command
-	else
-		echo "Not Removing Gnome Protocol Handler"
-	fi
-fi
-
-if [ -e "${FILENAME}" ]; then
-	CURRENT=`grep DMDirc ${FILENAME}`
-	if [ "" != "${CURRENT}" ]; then
-		echo "Removing KDE Protocol Handler"
-		rm -Rfv ${FILENAME}
-	else
-		echo "Not Removing KDE Protocol Handler"
-	fi
-fi
-
-echo "Removing Installation Directory"
-
-rm -Rfv ${INSTALL_LOCATION}
-
-PROFILEDIR="${HOME}/.DMDirc"
-
-if [ -e ${PROFILEDIR}/dmdirc.config ]; then
-	questiondialog "Uninstaller" "A DMDirc profile has been detected (${PROFILEDIR}) Do you want to delete it as well?"
-	if [ $? -eq 0 ]; then
-		rm -Rfv "${PROFILEDIR}"
-	fi
-fi
-
-messagedialog "Uninstaller" "DMDirc Uninstalled Successfully"
-
-echo "Done."
-
-exit 0;

installer/osx/DMDirc-Apple.c

@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *
- * JNI library for OS X url handling.
- * Compile with:
- *     gcc -dynamiclib -framework JavaVM -framework Carbon -o libDMDirc-Apple.jnilib DMDirc-Apple.c -arch x86_64
- */
-
-#include <Carbon/Carbon.h>
-#include <JavaVM/jni.h>
-
-/** The method to callback */
-static jmethodID callbackMethod;
-
-/** The JVM our callback is in */
-static JavaVM *jvm;
-
-/** The global reference to the Apple object that wants the callback */
-static jobject apple;
-
-/** Callback from OS X with URL. */
-static OSErr openURLCallback(const AppleEvent *theAppleEvent, AppleEvent* reply, long handlerRefcon);
-
-/**
- * JNI Method to register interest in callback.
- * Obtained from:
- *     javah -classpath plugins/ui_swing.jar com.dmdirc.addons.ui_swing.Apple
- * Reference:
- *     http://developer.apple.com/documentation/Carbon/Reference/Apple_Event_Manager/Reference/reference.html#//apple_ref/c/func/AEInstallEventHandler
- *
- * @param env The JNIEnvironment for this callback.
- * @param this The object that is registering the callback
- */
-JNIEXPORT jint JNICALL Java_com_dmdirc_addons_ui_1swing_Apple_registerOpenURLCallback (JNIEnv *env, jobject object) {
-	// Find the callback in the object
-	callbackMethod = (*env)->GetMethodID(env, (*env)->GetObjectClass(env, object), "handleOpenURL", "(Ljava/lang/String;)V");
-	
-	// Check if the callback exists.
-	if (callbackMethod != 0) {
-		// Store the JVM for this callback, and a global reference to the Apple object
-		(*env)->GetJavaVM(env, &jvm);
-		apple = (*env)->NewGlobalRef(env, object);
-	
-		// Now register the callback to ourself.
-		return (jint)AEInstallEventHandler(kInternetEventClass, kAEGetURL, NewAEEventHandlerUPP((AEEventHandlerProcPtr)openURLCallback), 0, false);
-	} else {
-		return 1;
-	}
-}
-
-
-/**
- * Callback from OS X with URL.
- * Reference:
- *     http://developer.apple.com/documentation/Carbon/Reference/Apple_Event_Manager/Reference/reference.html#//apple_ref/c/func/NewAEEventHandlerUPP
- *     http://developer.apple.com/documentation/Carbon/Reference/Apple_Event_Manager/Reference/reference.html#//apple_ref/c/tdef/AEEventHandlerUPP
- *     http://developer.apple.com/documentation/Carbon/Reference/Apple_Event_Manager/Reference/reference.html#//apple_ref/c/tdef/AEEventHandlerProcPtr
- *
- * @param theAppleEvent Pointer to apple event handle
- * @param reply Pointer to default reply event
- * @param handlerRefcon Reference constant for this callback. (Ignored)
- */
-static OSErr openURLCallback(const AppleEvent *theAppleEvent, AppleEvent* reply, long handlerRefcon) {
-	OSErr result = noErr;
-	Size givenLength = 0;
-	DescType type = typeChar;
-	
-	// Get the size of the string the callback wants to give us, and then
-	// check that it is > 0 in length.
-	result = AESizeOfParam(theAppleEvent, keyDirectObject, &type, &givenLength);
-	if (result == noErr && givenLength != 0) {
-		// Allocate a buffer for the result
-		// givenLength +1 for the \0
-		Size length = givenLength + 1;
-		char *dataPtr = (char*)malloc(length);
-		
-		if (dataPtr != 0) {
-			// Empty the buffer
-			memset(dataPtr, 0, length);
-			
-			// Get the url
-			result = AEGetParamPtr(theAppleEvent, keyDirectObject, typeChar, 0, dataPtr, givenLength, &givenLength);
-			// Did we get it?
-			if (result == noErr) {
-				// Get the java environment for the jvm we want to callback to
-				JNIEnv *env;
-				(*jvm)->AttachCurrentThread(jvm, (void **)&env, NULL);
-				
-				// Convert the url into a java string
-				jstring theURL = (*env)->NewStringUTF(env, dataPtr);
-				
-				// Call the method!
-				(*env)->CallVoidMethod(env, apple, callbackMethod, theURL);
-			}
-			
-			// Free the buffer
-			free(dataPtr);
-		}
-	}
-	
-	// And return!
-	return result;
-}

installer/osx/makeInstallerOSX.sh

@@ -1,455 +0,0 @@
-#!/bin/sh
-#
-# This script generates a .dmg file that includes dmdirc
-#
-# DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# Final Name of the installer (without file extention)
-INSTALLERNAME=DMDirc
-# full name of the file to output to
-RUNNAME="${PWD}/${INSTALLERNAME}.dmg"
-
-# Linux needs an entry in fstab to allow normal users to mount things (like a
-# dmg image).
-# These 2 config vars choose what dir and file we mount so that fstab can be
-# correct, these should be full paths, and are ignored on OSX.
-# This is the name of the image that gets mounted:
-LINUXIMAGE=${PWD}/DMDirc.dmg
-# This is the dir we mount it in
-LINUXIMAGEDIR=${PWD}/dmg
-# fstab entry should read:
-# ${LINUXIMAGE} ${LINUXIMAGEDIR} auto users,noauto,loop 0 0
-
-MKISOFS=`which mkisofs`
-HDIUTIL=`which hdiutil`
-
-JNIName="libDMDirc-Apple.jnilib"
-
-if [ ! -e "${JNIName}" ]; then
-	if [ -e "/System/Library/Frameworks/JavaVM.framework/Headers" ]; then
-		GCC=`which gcc`
-		${GCC} -dynamiclib -framework JavaVM -framework Carbon -o ${JNIName} DMDirc-Apple.c -arch x86_64
-		if [ ! -e "${JNIName}" ]; then
-			echo "JNI Lib not found and failed to compile. Aborting."
-			exit 1;
-		fi;
-	else
-		echo "JNI Lib not found, unable to compile on this system. Aborting."
-		exit 1;
-	fi;
-fi;
-
-if [ "" = "${HDIUTIL}" ]; then
-	if [ "" != "${MKISOFS}" ]; then
-		MKISOFS_TEST=`${MKISOFS} --help 2>&1 | grep apple`
-		if [ "" = "${MKISOFS_TEST}" ]; then
-			echo "This machine is unable to produce dmg images (no support from mkisofs). Aborting."
-			exit 1;
-		fi;
-	else
-		echo "This machine is unable to produce dmg images (missing mkisofs or hdiutil). Aborting."
-		exit 1;
-	fi;
-fi;
-
-# Go!
-echo "-----------"
-if [ -e "${RUNNAME}" ]; then
-	echo "Removing existing .dmg file"
-	rm -Rf ./*.dmg
-fi
-
-WGET=`which wget`
-FETCH=`which fetch`
-CURL=`which curl`
-getFile() {
-	URL=${1}
-	OUTPUT=${2}
-
-	if [ "${WGET}" != "" ]; then
-		${WGET} -O ${OUTPUT} ${URL}
-	elif [ "${FETCH}" != "" ]; then
-		${FETCH} -o ${OUTPUT} ${URL}
-	elif [ "${CURL}" != "" ]; then
-		${CURL} -o ${OUTPUT} ${URL}
-	fi;
-}
-
-showHelp() {
-	echo "This will generate a DMDirc installer for a unix based system."
-	echo "The following command line arguments are known:"
-	echo "---------------------"
-	echo "-h, --help                Help information"
-	echo "-b, --branch              Release in -r is a branch "
-	echo "-p, --plugins <plugins>   What plugins to add to the jar file"
-	echo "-c, --compile             Recompile the .jar file"
-	echo "    --jar <file>          use <file> as DMDirc.jar"
-	echo "    --current             Use the current folder as the base for the build"
-	echo "-e, --extra <tag>         Tag to add to final exe name to distinguish this build from a standard build"
-	echo "---------------------"
-	exit 0;
-}
-
-# Check for some CLI params
-compileJar="false"
-isRelease=""
-finalTag=""
-BRANCH="0"
-plugins=""
-location="../../"
-current="1"
-jarfile=""
-TAGGED=""
-while test -n "$1"; do
-	case "$1" in
-		--plugins|-p)
-			shift
-			plugins=${1}
-			;;
-		--jar)
-			shift
-			jarfile=${1}
-			;;
-		--current)
-			location="../../"
-			current="1"
-			;;
-		--compile|-c)
-			compileJar="true"
-			;;
-		--release|-r)
-			shift
-			isRelease=${1}
-			;;
-		--extra|-e)
-			shift
-			finalTag=${1}
-			RUNNAME="${PWD}/${INSTALLERNAME}-${1}.dmg"
-			;;
-		--help|-h)
-			showHelp;
-			;;
-		--branch|-b)
-			BRANCH="1"
-			;;
-		--tag|-t)
-			TAGGED=`git describe --tags`
-			TAGGED=${TAGGED%%-*}
-			;;
-	esac
-	shift
-done
-if [ "" = "${current}" ]; then
-	jarPath="${location}trunk"
-else
-	jarPath="${location}"
-fi
-
-if [ "" = "${jarfile}" ]; then
-	jarfile=${jarPath}"/dist/DMDirc.jar"
-	if [ ! -e ${jarPath}"/dist/DMDirc.jar" -o "${compileJar}" = "true" ]; then
-		echo "Creating jar.."
-		OLDPWD=${PWD}
-		cd ${jarPath}
-
-		rm -Rf build dist
-		ant jar
-		if [ ! -e "dist/DMDirc.jar" ]; then
-			echo "There was an error creating the .jar file. Aborting."
-			exit 1;
-		fi;
-		cd ${OLDPWD}
-	fi;
-elif [ ! -e "${jarfile}" ]; then
-	echo "Requested Jar file (${jarfile}) does not exist."
-	exit 1;
-fi;
-
-echo "Copying jar (${jarfile}).."
-cp ${jarfile} "./DMDirc.jar"
-if [ "" != "${plugins}" ]; then
-	echo "Adding plugins to jar"
-	ln -sf ${jarPath}"/plugins"
-	pluginList=""
-	for plugin in ${plugins}; do
-		pluginList=${pluginList}" plugins/${plugin}"
-	done
-	jar -uvf "DMDirc.jar" ${pluginList}
-
-	../../updateBundledPlugins.sh "DMDirc.jar";
-	rm -Rf plugins;
-fi
-
-APPDIR="DMDirc.app"
-CONTENTSDIR=${APPDIR}/Contents
-RESDIR=${CONTENTSDIR}/Resources
-MACOSDIR=${CONTENTSDIR}/MacOS
-
-if [ -e "${APPDIR}" ]; then
-	echo "Removing existing .app directory";
-	rm -Rf ${APPDIR}
-fi;
-
-echo "Creating .app directory"
-mkdir -pv ${APPDIR}
-mkdir -pv ${CONTENTSDIR}
-mkdir -pv ${RESDIR}
-mkdir -pv ${RESDIR}/Java
-mkdir -pv ${MACOSDIR}
-
-echo "Creating meta files"
-echo "APPLDMDI" > ${CONTENTSDIR}/PkgInfo
-
-doRename=0
-if [ "${TAGGED}" != "" ]; then
-	doRename=1	
-fi;
-
-if [ ${doRename} -eq 1 ]; then
-	if [ "${TAGGED}" = "" ]; then
-		bundleVersion=branch-${isRelease}
-	else
-		bundleVersion=${TAGGED}
-	fi
-else
-	bundleVersion="trunk-"`date +%Y%m%d_%H%M%S`
-fi;
-
-
-cat <<EOF> ${CONTENTSDIR}/Info.plist
-
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
-<plist version="0.9">
-<dict>
-	<key>CFBundleName</key>
-	<string>DMDirc</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.dmdirc.osx</string>
-	<key>CFBundleAllowMixedLocalizations</key>
-	<string>true</string>
-	<key>CFBundleExecutable</key>
-	<string>DMDirc.sh</string>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleSignature</key>
-	<string>DMDI</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleIconFile</key>
-	<string>dmdirc.icns</string>
-	<key>CFBundleVersion</key>
-	<string>${bundleVersion}</string>
-	<key>CFBundleShortVersionString</key>
-	<string>${bundleVersion}</string>
-	<key>Java</key>
-	<dict>
-		<key>WorkingDirectory</key>
-		<string>\$APP_PACKAGE/Contents/Resources/Java</string>
-		<key>MainClass</key>
-		<string>com.dmdirc.Main</string>
-		<key>JVMVersion</key>
-		<string>1.6+</string>
-		<key>ClassPath</key>
-		<string>\$JAVAROOT/DMDirc.jar</string>
-	</dict>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleURLName</key>
-			<string>IRC URL</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>irc</string>
-			</array>
-		</dict>
-	</array>
-</dict>
-</plist>
-EOF
-
-#	<key>Properties</key>
-#	<dict>
-#		<key>com.apple.mrj.application.growbox.intrudes</key>
-#		<string>false</string>
-#		<key>com.apple.mrj.application.live-resize</key>
-#		<string>true</string>
-#		<key>com.apple.mrj.application.apple.menu.about.name</key>
-#		<string>DMDirc</string>
-#		<key>apple.laf.useScreenMenuBar</key>
-#		<string>true</string>
-#	</dict>
-
-cp DMDirc.jar ${RESDIR}/Java/DMDirc.jar
-cp ${JNIName} ${RESDIR}/Java/${JNIName}
-
-#if [ -e "../common/installer.jar" ]; then
-#	ln -sf ../common/installer.jar ./installer.jar
-#	FILES="${FILES} installer.jar"
-#else
-#	echo "[WARNING] Creating installer-less archive - relying on setup.sh"
-#fi
-
-if [ -e ${jarPath}"/installer/osx/res/dmdirc.icns" ]; then
-	cp ${jarPath}"/installer/osx/res/dmdirc.icns" ${RESDIR}/dmdirc.icns
-fi
-
-if [ "${isRelease}" != "" ]; then
-	DOCSDIR=${jarPath}
-else
-	DOCSDIR="../common"
-fi
-
-if [ -e "${DOCSDIR}/README.TXT" ]; then
-	cp "${DOCSDIR}/README.TXT" ${RESDIR}/README.TXT
-fi
-
-if [ -e "${DOCSDIR}/CHANGES.TXT" ]; then
-	cp "${DOCSDIR}/CHANGES.TXT" ${RESDIR}/CHANGES.TXT
-elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
-	cp "${DOCSDIR}/CHANGELOG.TXT" ${RESDIR}/CHANGELOG.TXT
-fi
-
-if [ -e "${jarPath}/launcher/unix" ]; then
-	cp ${jarPath}/launcher/unix/DMDirc.sh ${MACOSDIR}/DMDirc.sh
-	chmod a+x ${MACOSDIR}/DMDirc.sh
-fi
-
-if [ -e "${jarPath}/installer/linux" ]; then
-        cp ${jarPath}/installer/linux/functions.sh ${MACOSDIR}/functions.sh
-else
-	echo "Unable to find launcher functions, exiting."
-	exit 1;
-fi
-
-echo "Packaging.."
-# Create RUNNAME
-# Create temp dir
-DMG=package
-if [ -e ${DMG} ]; then
-	rm -Rf ${DMG}
-fi;
-mkdir ${DMG}
-# Copy the application
-mv ${APPDIR} ${DMG}/
-# link to /Applications to allow easy drag and drop
-ln -sf /Applications ${DMG}/
-
-if [ -e ${jarPath}"/installer/osx/res/VolumeIcon.icns" ]; then
-	cp -v ${jarPath}"/installer/osx/res/VolumeIcon.icns" ${DMG}/.VolumeIcon.icns
-fi
-
-if [ -e ${jarPath}"/installer/osx/res/Background.png" ]; then
-	mkdir ${DMG}/.background
-	cp -v ${jarPath}"/installer/osx/res/Background.png" ${DMG}/.background/background.png
-fi
-
-if [ -e ${PWD}/.DS_Store ]; then
-	cp -v ${PWD}/.DS_Store ${DMG}/.DS_Store
-fi
-
-# Now, make a dmg
-if [ "" = "${HDIUTIL}" ]; then
-	# Make sure the variables are set
-	if [ "" = "${LINUXIMAGEDIR}" ]; then
-		LINUXIMAGEDIR=${PWD}/dmg
-	fi;
-	if [ "" = "${LINUXIMAGED}" ]; then	
-		LINUXIMAGE=${PWD}/DMDirc.dmg
-	fi;
-
-	# Non-OSX
-	# Create Read-Only blessed image
-	${MKISOFS} -V 'DMDirc' -no-pad -r -apple -o "${LINUXIMAGE}" -hfs-creator "DMDI" -hfs-bless "/Volumes/DMDirc" "${DMG}"
-
-	# Compres it \o
-	if [ ! -e "${PWD}/compress-dmg" ]; then
-		getFile "http://binary.dmdirc.com/dmg" "compress-dmg"
-		chmod a+x compress-dmg
-	fi;
-	if [ ! -e "${PWD}/compress-dmg" ]; then
-		echo "DMG will not be compressed."
-	else
-		echo "Compressing DMG"
-		mv ${LINUXIMAGE} ${LINUXIMAGE}.pre
-		${PWD}/compress-dmg dmg ${LINUXIMAGE}.pre ${LINUXIMAGE}
-		if [ -e ${LINUXIMAGE} ]; then
-			rm -Rf ${LINUXIMAGE}.pre
-		else
-			echo "Compression failed."
-			mv ${LINUXIMAGE}.pre ${LINUXIMAGE}
-		fi;
-	fi;
-	
-	if [ "${LINUXIMAGE}" != "${RUNNAME}" ]; then
-		# Rename the image
-		mv ${LINUXIMAGE} ${RUNNAME}
-	fi;
-else
-	# OSX
-	# Create Read/Write image
-	${HDIUTIL} create -volname "DMDirc" -fs HFS+ -srcfolder ${DMG} -format UDRW ${RUNNAME}.RW.dmg
-	# Make it auto-open
-	BLESS=`which bless`
-	if [ "" != "${BLESS}" ]; then
-		if [ -e /Volumes/DMDirc ]; then
-			${HDIUTIL} detach /Volumes/DMDirc
-		fi;
-		if [ ! -e /Volumes/DMDirc ]; then
-			${HDIUTIL} attach ${RUNNAME}.RW.dmg
-			${BLESS} -openfolder /Volumes/DMDirc
-			${HDIUTIL} detach /Volumes/DMDirc
-		fi;
-	fi;
-	# Convert to compressed read-only image
-	${HDIUTIL} convert ${RUNNAME}.RW.dmg -format UDZO -imagekey zlib-level=9 -o ${RUNNAME}
-	rm ${RUNNAME}.RW.dmg
-fi;
-
-echo "DMG Creation complete!"
-
-if [ ${doRename} -eq 1 ]; then
-	if [ "${TAGGED}" = "" ]; then
-		isRelease=branch-${isRelease}
-	else
-		isRelease=${TAGGED}
-	fi;
-	if [ "" != "${finalTag}" ]; then
-		finalTag="-${finalTag}"
-	fi;
-	finalname=DMDirc-${isRelease}${finalTag}.dmg
-else
-	finalname=${RUNNAME##*/}
-fi;
-
-mv ${RUNNAME} ../output/${finalname}
-
-rm -Rfv ${DMG} ${APPDIR} ${DMGMOUNTDIR} DMDirc.jar
-
-echo "-----------"
-echo "Done."
-echo "-----------"
-
-# and Done \o
-exit 0;

installer/release.sh

@@ -1,223 +0,0 @@
-#!/bin/sh
-
-# Jar names of plugins to add to ALL installers. (* means all)
-plugins="ui_swing.jar tabcompletion_bash.jar tabcompletion_mirc.jar parser_irc.jar dcc.jar dns.jar identd.jar lagdisplay.jar logging.jar systray.jar time.jar osd.jar"
-
-# Additional Jar names of plugins to add to only Windows installers. (* means all)
-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]"
-	echo "The following params are known:"
-	echo "---------------------"
-	echo "-t,  --tag                          This is a tagged release"
-	echo "     --jar <file>                   Use <file> instead of compiling a jar."
-	echo "     --fulljar <file>               Use <file> instead of compiling a jar, and don't run makeJar on it."
-	echo "     --jre                          Include a jre in the installers."
-	echo "     --jre64                        Include a 64bit jre in the installers."
-	echo "     --target <target>              Build only a specific target. <target> should be one of 'windows', 'linux' or 'osx'."
-	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 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 "     --upload                       Try to upload to google code when done (Only works on tags)"
-	echo "-c   --channel [channel]            Channel to pass to ant (if not passed, 'NONE', if passed without a value, 'STABLE')"
-	echo "     --compile                      Recompile the .jar file (otherwise use the existing file from dist/)"
-	echo "---------------------"
-	exit 0;
-}
-
-# Check for some CLI params
-LAST=""
-OPT=""
-BRANCH=""
-JARFILE=""
-JRE=""
-FULLJAR=""
-BUILDTARGET=""
-UPLOAD="0"
-TAG="0"
-TAGGED=""
-CHANNEL=""
-compileJar=""
-while test -n "$1"; do
-	LAST=${1}
-	case "$1" in
-		--plugins|-p)
-			shift
-			plugins="${1}"
-			;;
-		--target)
-			shift
-			BUILDTARGET="${1}"
-			;;
-		--jar)
-			shift
-			JARFILE="--jar ${1} "
-			;;
-		--fulljar)
-			shift
-			JARFILE="--jar ${1} "
-			FULLJAR="1"
-			;;
-		--jre|--jre64)
-			JRE="${1} "
-			;;
-		--plugins-linux|-pl)
-			shift
-			plugins_linux="${1}"
-			;;
-		--plugins-windows|-pw)
-			shift
-			plugins_windows="${1}"
-			;;
-		--plugins-osx|-po)
-			shift
-			plugins_osx="${1}"
-			;;
-		--opt|-o)
-			shift
-			OPT="${1} "
-			;;
-		--help|-h)
-			showHelp;
-			;;
-		--upload)
-			UPLOAD="1";
-			;;
-		--branch|-b)
-			BRANCH="-b "
-			;;
-		--compile)
-			compileJar="--compile "
-			;;
-		--tag|-t)
-			TAGGED="-t "
-
-			# Always recompile if tagging
-			compileJar="--compile "
-			;;
-		--channel|-c)
-			PASSEDPARAM=`echo "${2}" | grep -v ^- | grep -v " "`
-			if [ "${PASSEDPARAM}" != "" ]; then
-				shift
-				CHANNEL="--channel ${PASSEDPARAM} ";
-			else
-				CHANNEL="--channel STABLE ";
-			fi;
-			# Always recompile if passing a channel
-			compileJar="--compile "
-			;;
-	esac
-	shift
-done
-
-if [ ! -e output ]; then
-	mkdir output
-fi;
-
-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
-		allPlugins=${allPlugins}" ${thisfile##*/}"
-	done
-	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;
-
-VERSION=`git branch | grep ^* | sed "s/^* //g"`
-if [ "${VERSION}" = "master" ]; then
-	RELEASE=""
-else
-	RELEASE="-r ${VERSION}"
-fi;
-
-JAR=`which jar`
-JAVAC=`which javac`
-# OSX Users might have a non 1.6 javac, look specifically for it.
-if [ -e "/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands/javac" ]; then
-	JAVAC="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands/javac"
-elif [ -e "/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/javac" ]; then
-	JAVAC="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/javac"
-fi;
-
-THISDIR=${PWD}
-
-echo "================================================================"
-echo "Removing existing releases from output directory"
-echo "================================================================"
-rm -Rf output/*.run output/*.exe output/*.dmg
-
-if [ "" = "${FULLJAR}" ]; then
-	echo "================================================================"
-	echo "Building Release Jar"
-	echo "================================================================"
-	cd jar
-	./makeJar.sh ${compileJar}${CHANNEL}${OPT}${JARFILE}${JRE}-c -k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins}"
-	RESULT=${?}
-	cd ${THISDIR}
-
-	if [ ${RESULT} -eq 0 ]; then
-		JARNAME=`ls -1tr output | grep jar$ | tail -n 1`
-		JARFILE="--jar ../output/${JARNAME} "
-	else
-		echo "Failed to build release jar, aborting."
-		exit 1;
-	fi;
-fi;
-
-if [ "linux" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
-	echo "================================================================"
-	echo "Building linux installer"
-	echo "================================================================"
-	cd linux
-	./makeInstallerLinux.sh ${OPT}${JARFILE}${JRE}-k ${TAGGED}${BRANCH}${RELEASE} -p "${plugins_linux}"
-	cd ${THISDIR}
-fi;
-
-if [ "windows" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
-	echo "================================================================"
-	echo "Building NSIS Windows installer"
-	echo "================================================================"
-	cd windows
-	./makeInstallerNSIS.sh ${OPT}${JARFILE}${JRE}-k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins_windows}"
-	cd ${THISDIR}
-fi;
-
-if [ "osx" = "${BUILDTARGET}" -o "" = "${BUILDTARGET}" ]; then
-	echo "================================================================"
-	echo "Building OSX Bundle"
-	echo "================================================================"
-	cd osx
-	./makeInstallerOSX.sh ${OPT}${JARFILE}-k -s ${TAGGED}${BRANCH}${RELEASE} -p "${plugins_osx}"
-	cd ${THISDIR}
-fi;
-
-
-if [ "1" = "${UPLOAD}" -a "" != "${TAGGED}" ]; then
-	echo "================================================================"
-	echo "Uploading to GoogleCode"
-	echo "================================================================"
-	
-	cd gcode
-	sh uploads_release.sh -v ${VERSION}
-else
-	echo "Not uploading to GoogleCode (Only tagged releases can be uploaded)"
-fi;
-
-echo "================================================================"
-echo "Release ready - see output folder"
-echo "================================================================"
-exit 0;

installer/signing/readme.txt

@@ -1,6 +0,0 @@
-exe Signing stuff goes here on renji.
-   DMDirc.cer
-   DMDirc.pvk 
-   DMDirc.spc
-
-(This file makes git (and thus svn) track this directory)

installer/windows/makeInstallerNSIS.sh

@@ -1,124 +0,0 @@
-#!/bin/sh
-## Temporary Hack, this should be removed at some point when we stop
-## using everything in /installer
-## This script only understands the parameters needed by BuildAll and the
-## installer-* ant targets.
-
-if [ ! -e "../../modules/installer/windows/" ]; then
-	echo "Unable to find NSIS Source"
-	exit 1;
-fi;
-
-
-signEXE="true"
-
-while test -n "$1"; do
-	case "$1" in
-		--plugins|-p)
-			shift
-			plugins=${1}
-			;;
-		--jar)
-			shift
-			jarfile=${1}
-			;;
-		--tag|-t)
-			TAGGED=`git describe --tags`
-			TAGGED=${TAGGED%%-*}
-			;;
-		--unsigned|-u)
-			signEXE="false"
-			;;
-		--extra|-e)
-			shift
-			finalTag="-${1}"
-			;;
-	esac
-	shift
-done
-
-INSTALLNAME=DMDirc-Setup
-OLDDIR=`pwd`
-
-mkdir -p ../../modules/installer/output
-rm -Rfv ../../modules/installer/windows/files
-mkdir -p ../../modules/installer/windows/files
-
-cp "${jarfile}" "../../modules/installer/windows/files/DMDirc.jar"
-cd ../../modules/installer/windows/files
-
-if [ "" != "${plugins}" ]; then
-	echo "Adding plugins to jar"
-	ln -sf ${jarPath}"/plugins"
-	pluginList=""
-	for plugin in ${plugins}; do
-		pluginList=${pluginList}" plugins/${plugin}"
-	done
-	jar -uvf "DMDirc.jar" ${pluginList}
-
-	../../../../updateBundledPlugins.sh
-	rm -Rf plugins;
-fi
-
-cp ../../../../src/com/dmdirc/res/icon.ico icon.ico
-
-cd ..
-
-for NSI in updater.nsi launcher.nsi installer.nsi; do
-	LASTCOMMIT=`git rev-list --max-count=1 HEAD -- $NSI`
-	NSISVERSION=`git describe --tags --always $LASTCOMMIT`
-	makensis -DVERSION="${NSISVERSION}" -V2 $NSI;
-done
-
-cd "${OLDDIR}"
-SRC="../../modules/installer/output/DMDirc-Setup.exe"
-
-doRename=0
-if [ "${TAGGED}" != "" ]; then
-	doRename=1
-fi;
-
-if [ ${doRename} -eq 1 ]; then
-	if [ "${TAGGED}" = "" ]; then
-		releaseTag=branch-${isRelease}
-	else
-		releaseTag=${TAGGED}
-	fi;
-	DEST="DMDirc-${releaseTag}-Setup${finalTag}.exe"
-else
-	DEST="${INSTALLNAME}${finalTag}.exe"
-fi;
-
-mv "${SRC}" "../output/${DEST}"
-
-# Get signcode path
-SIGNCODE=`which signcode`
-
-if [ "" = "${SIGNCODE}" ]; then
-	echo "Signcode not found. EXE's will not be digitally signed."
-fi
-
-# Sign stuff!
-signexe() {
-	if [ "" != "${SIGNCODE}" ]; then
-		if [ -e "../signing/DMDirc.spc" -a -e "../signing/DMDirc.pvk" ]; then
-			echo "Digitally Signing EXE (${@})..."
-			${SIGNCODE} -spc "../signing/DMDirc.spc" -v "../signing/DMDirc.pvk" -i "http://www.dmdirc.com/" -n "DMDirc Installer" $@ 2>/dev/null || {
-				kill -15 $$;
-			};
-			rm ${@}.sig
-			rm ${@}.bak
-		fi
-	fi
-}
-
-FULLINSTALLER="../output/${DEST}"
-
-echo "Chmodding.."
-chmod a+x ${FULLINSTALLER}
-if [ "${signEXE}" = "true" ]; then
-	echo "Signing.."
-	signexe ${FULLINSTALLER}
-else
-	echo "Not Signing.."
-fi;

launcher/createUpdate.sh

@@ -1,70 +0,0 @@
-#!/bin/sh
-# This script generates the launcher updates
-LAUNCHERDIR=`dirname $0`
-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}'`
-
-# Find out what params we should pass to things.
-# Solaris has a nice and ancient version of grep in /usr/bin
-grep -na "" /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	GREPOPTS="-n"
-else
-	GREPOPTS="-na"
-fi;
-# Solaris also has a crappy version of tail!
-tail -n +1 /dev/null >/dev/null 2>&1
-if [ $? -eq 2 ]; then
-	TAILOPTS="+"
-else
-	TAILOPTS="-n +"
-fi;
-
-if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
-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} "^\s*###FUNCTIONS_FILE###\s*$" ${SRCFILE}`
-		if [ "${FUNCTIONSLINE}" == "" ]; then
-			cp ${SRCFILE} ${DESTFILE}
-		else
-			FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
-			
-			head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
-			cat ${FUNCTIONSFILE} >> ${DESTFILE}
-			echo "" >> ${DESTFILE}
-			tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
-		fi;
-	else
-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
-echo	/home/dmdirc/scripts/oblong.sh "LAUNCHER" "Creating Launcher Update: windows-${WINDOWSVERSION}";
-	OLDDIR=${PWD}
-	cd ${LAUNCHERDIR}/windows
-	sh compile.sh
-	# Create symlinks
-	for exe in `ls *.exe`; do
-		ln -s ${exe} .${exe}
-	done;
-
-	# Create Zip File
-	zip -9 ${LAUNCHERUPDATEDIR}/windows-${WINDOWSVERSION}.zip .*.exe
-
-	# Remove temp exes
-	for exe in `ls .*.exe`; do
-		rm -Rf ${exe}
-	done;
-
-	cd ${OLDDIR}
-fi;

launcher/unix/DMDirc.sh

@@ -1,522 +0,0 @@
-#!/bin/sh
-#
-# This script launches dmdirc and attempts to update the jar file if needed.
-#
-# DMDirc - Open Source IRC Client
-# Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes, Simon
-# Mott
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-LAUNCHERVERSION="18"
-LAUNCHERINFO="unix-${LAUNCHERVERSION}"
-
-params=""
-
-# Check the which command exists, and if so make sure it behaves how we want
-# it to...
-WHICH=`which which 2>/dev/null`
-if [ "" = "${WHICH}" ]; then
-	echo "which command not found. Aborting.";
-	exit 0;
-else
-	# Solaris sucks
-	BADWHICH=`which /`
-	if [ "${BADWHICH}" != "" ]; then
-		echo "Replacing bad which command.";
-		# "Which" on solaris gives non-empty results for commands that don't exist
-		which() {
-			OUT=`${WHICH} ${1}`
-			if [ $? -eq 0 ]; then
-				echo ${OUT}
-			else
-				echo ""
-			fi;
-		}
-	fi;
-fi
-
-# Find out where we are
-BASEDIR=$(cd "${0%/*}" 2>/dev/null; echo $PWD)
-
-# Store params so that we can pass them back to the client
-for param in "$@"; do
-	if [ "${param}" = "--noprofile" -o "${param}" = "--updateonly" ]; then 
-		continue;
-	fi;
-	PSN=`echo "${param}" | grep "^-psn_"`
-	if [ "" = "${PSN}" ]; then
-		SPACE=`echo "${param}" | grep " "`
-		if [ "${SPACE}" != "" ]; then
-			niceParam=`echo "${param}" | sed 's/"/\\\\"/g'`
-			params=${params}" \"${niceParam}\""
-		else
-			params=${params}" ${param}"
-		fi;
-	fi;
-done;
-
-if [ -e "${BASEDIR}/functions.sh" ]; then
-	. ${BASEDIR}/functions.sh
-else
-	echo "Unable to find functions.sh, using built in functions"
-	###FUNCTIONS_FILE###
-fi;
-
-# Check to see if we can bspatch things
-BSPATCH="./bspatch"
-if [ ! -e "${BSPATCH}" ]; then
-	BSPATCH=`which bspatch`
-fi;
-
-# This launcher supports zip files.
-LAUNCHERINFO=${LAUNCHERINFO}",zip"
-
-if [ "${BSPATCH}" != "" ]; then
-	# TODO: Website should (if available) send bsdiff patches
-	# to clients with bsdiff compatible launchers
-	LAUNCHERINFO=${LAUNCHERINFO}",bsdiff";
-fi;
-
-# Check for some CLI params
-if [ "${ISOSX}" = "1" ]; then
-	profiledir="${HOME}/Library/Preferences/DMDirc/"
-else
-	profiledir="${HOME}/.DMDirc/"
-	if [ ! -d "${profiledir}" ]; then
-		profiledir="${XDG_CONFIG_HOME}"
-		if [ "${profiledir}" = "" ]; then
-			profiledir="${HOME}/.config"
-		fi;
-		profiledir="${profiledir}/DMDirc/"
-	fi;
-fi;
-
-USEPROFILE=1;
-UPDATEONLY=0;
-while test -n "$1"; do
-	case "$1" in
-		--directory|-d)
-			shift
-			profiledir=${1}
-			;;
-		--noprofile)
-			USEPROFILE=0;
-			;;
-		--updateonly)
-			UPDATEONLY=1;
-			;;
-		-p|--portable)
-			profiledir=${PWD};
-			;;
-	esac
-	shift
-done
-
-getConfigOption() {
-	FILE="${profiledir}/dmdirc.config"
-	WANTED_DOMAIN="${1}"
-	WANTED_KEY="${2}"
-	CURRENT_SECTION=""
-	if [ "${WANTED_KEY}" != "" -a "${WANTED_DOMAIN}" = "" ]; then
-		if [ -e "${FILE}" ]; then
-			cat ${FILE} | sed 's/\\/\\\\/g' | while IFS='' read -r LINE; do
-				IS_SECTION=`echo ${LINE} | egrep "^.*:$"`
-				IS_KEYVALUE=`echo ${LINE} | egrep "^[[:space:]]+.*=.*$"`
-				if [ "" != "${IS_SECTION}" ]; then
-					CURRENT_SECTION=${LINE%%:*}
-				elif [ "" != "${IS_KEYVALUE}" ]; then
-					KEY=`echo ${LINE%%=*} | sed 's/^\s*//g'`
-					VALUE=${LINE##*=}
-					if [ "${WANTED_DOMAIN}" = "${CURRENT_SECTION}" -a "${WANTED_KEY}" = "${KEY}" ]; then
-						echo ${VALUE};
-					fi;
-				fi;
-			done;
-		fi;
-	fi;
-}
-
-if [ "${ISOSX}" = "1" ]; then
-	jarDir=${BASEDIR}/../Resources/Java/
-	jar=${jarDir}DMDirc.jar
-else
-	jar=${BASEDIR}/DMDirc.jar
-fi
-launcherUpdater=${profiledir}/updateLauncher.sh
-BSDJava1="/usr/local/jdk1.6.0/jre/bin/java"
-BSDJava2="/usr/local/diablo-jdk1.6.0/jre/bin/java"
-echo "---------------------"
-echo "DMDirc - Open Source IRC Client"
-echo "Launcher Version: ${LAUNCHERVERSION}"
-echo "Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes, Simon Mott"
-echo "---------------------"
-if [ "${ISOSX}" = "1" ]; then
-	echo "Running on OS X."
-elif [ "${KERNEL}" = "Linux" ]; then
-	echo "Running on Linux."
-elif [ "`echo ${KERNEL} | grep -i BSD`" != "" ]; then
-	echo "Running on BSD."
-elif [ "`echo ${KERNEL} | grep -i SunOS`" != "" ]; then
-	echo "Running on Solaris."
-else
-	echo "Running on unknown unix variation: ${KERNEL}."
-fi;
-
-if [ -e "${profiledir}/.launcher.zip" ]; then
-	# Unzip!
-	unzip ${profiledir}/.launcher.zip -d ${profiledir}/
-fi;
-
-echo -n "Checking for launcher updates in ${profiledir} - ";
-if [ -e "${profiledir}/.launcher.sh.ignore" ]; then
-	rm -Rf "${profiledir}/.launcher.sh.ignore"
-	echo "Ignoring!";
-elif [ -e "${profiledir}/.launcher.sh" ]; then
-	echo "Found!";
-	echo "Attempting to update..";
-
-	# The code below intentionally doesn't use the FUNCTIONS_FILE include as it
-	# wouldn't correctly escape \${0} and \${2} where needed and thus stuff would
-	# break!
-	cat <<EOF> ${launcherUpdater}
-		cd ${BASEDIR}
-		if [ -e "${BASEDIR}/functions.sh" ]; then
-			. ${BASEDIR}/functions.sh
-		else
-			echo "Unable to find functions.sh, using old functions"
-			errordialog() {
-				# Send message to console.
-				echo ""
-				echo "-----------------------------------------------------------------------"
-				echo "Error: \${1}"
-				echo "-----------------------------------------------------------------------"
-				echo "\${2}"
-				echo "-----------------------------------------------------------------------"
-	
-				if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-					echo "Displaying dialog.."
-					${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"${1}\n${2}\" buttons {\"Ok\"} with icon stop" -e 'end tell'
-				else
-					if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
-						echo "Dialog on Display: ${DISPLAY}"
-						${KDIALOG} --title "DMDirc: \${1}" --error "\${1}\n\n\${2}"
-					elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-						echo "Dialog on Display: ${DISPLAY}"
-						${ZENITY} --error --title "DMDirc: \${1}" --text "\${1}\n\n\${2}"
-					fi
-				fi
-			}
-	
-			messagedialog() {
-				# Send message to console.
-				echo ""
-				echo "-----------------------------------------------------------------------"
-				echo "Info: \${1}"
-				echo "-----------------------------------------------------------------------"
-				echo "\${2}"
-				echo "-----------------------------------------------------------------------"
-	
-				if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-					echo "Displaying dialog.."
-					${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"${1}\n${2}\" buttons {\"Ok\"} giving up after 120 with icon note" -e 'end tell'
-				else
-					if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
-						echo "Dialog on Display: ${DISPLAY}"
-						${KDIALOG} --title "DMDirc: \${1}" --msgbox "\${1}\n\n\${2}"
-					elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-						echo "Dialog on Display: ${DISPLAY}"
-						${ZENITY} --info --title "DMDirc: \${1}" --text "\${1}\n\n\${2}"
-					fi
-				fi;
-			}
-		fi;
-
-		mv -fv ${profiledir}/.launcher.sh ${0}
-		if [ ! -e "${profiledir}/.launcher.sh" ]; then
-			echo "Launcher Update successful."
-			messagedialog "Launcher Update" "Launcher Update successful"
-		else
-			if [ "${UID}" = "" ]; then
-				UID=`id -u`;
-			fi
-			if [ "0" != "${UID}" ]; then
-				if [ "${ISOSX}" = "1" ]; then
-					messagedialog "DMDirc" "The DMDirc Client Updater was unable to modify the client installation, trying again with administrator access"
-					if [ $? -eq 0 ]; then
-						echo "Password dialog on display"
-						osascript -e do shell script "mv -fv \"${profiledir}/.launcher.sh\" \"${0}\"" with administrator privileges
-					fi;
-				else
-					if [ "" != "${ISKDE}" -a "" != "${KSUDO}" -a "" != "${DISPLAY}" ]; then
-						echo "Password dialog on ${DISPLAY}"
-						${KSUDO} --comment "DMDirc Client Updater requires root access to modify the global installation" -- mv -fv "${profiledir}/.launcher.sh" "${0}"
-					elif [ "" != "${ISGNOME}" -a "" != "${GSUDO}" -a "" != "${DISPLAY}" ]; then
-						echo "Password dialog on ${DISPLAY}"
-						${GSUDO} -k --message "DMDirc Client Updater requires root access to modify the global installation" -- mv -fv "${profiledir}/.launcher.sh" "${0}"
-					elif [ "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then	
-						sudo -k
-						${ZENITY} --entry --title="DMDirc" --text="DMDirc Client Updater requires root access to modify the global installation, please enter your password to continue." --entry-text="" --hide-text | sudo -S -- mv -fv "${profiledir}/.launcher.sh" "${0}"
-					else
-						echo "DMDirc Client Updater requires root access to modify the global installation"
-						sudo mv -fv "${profiledir}/.launcher.sh" "${0}"
-					fi;
-				fi;
-			fi
-			if [ ! -e "${profiledir}/.launcher.sh" ]; then
-				echo "Update successful."
-				messagedialog "Launcher Update" "Launcher Update successful"
-			else
-				echo "Launcher failed."
-				errordialog "Launcher Update" "Launcher Update failed, using old version"
-				touch ${profiledir}/.launcher.sh.ignore
-			fi;
-		fi;
-		sh ${0} ${params}
-EOF
-	chmod a+x ${launcherUpdater}
-	${launcherUpdater}
-	exit 0;
-else
-	echo "Not found.";
-fi;
-
-if [ -e "${launcherUpdater}" ]; then
-	rm -Rf "${launcherUpdater}"
-fi;
-
-echo -n "Checking for client updates in ${profiledir} - ";
-
-UPDATESOURCE="${profiledir}/.DMDirc.jar"
-BSDIFF="0"
-if [ -e "${profiledir}/.DMDirc.jar.bsdiff" -a "${BSPATCH}" != "" ]; then
-	UPDATESOURCE="${profiledir}/.DMDirc.jar.bsdiff"
-	BSDIFF="1"
-fi;
-
-if [ -e "${UPDATESOURCE}" ]; then
-	UPDATEOK="0"
-	TRYROOT="1"
-	echo "Found!";
-	echo "Attempting to update..";
-	if [ "${BSDIFF}" = "1" ]; then
-		cp ${jar} ${jar}.bak
-		${BSPATCH} ${jar}.bak ${jar} ${UPDATESOURCE}
-		if [ "${?}" = "0" ]; then
-			FILEINFO=`which ${jar} | egrep "data$"`
-			if [ "${FILEINFO}" = "" ]; then
-				UPDATEOK="1"
-			else
-				# Let the user know the update failed.
-				echo "1" >> "${profiledir}/.updatefailed";
-				chmod 777 "${profiledir}/.updatefailed";
-				# Replace the attempted update with the old jar
-				cp ${jar}.bak ${jar}
-				# Don't bother trying as root.
-				TRYROOT="0"
-			fi;
-		fi;
-	else
-		mv -fv ${UPDATESOURCE} ${jar}
-		if [ ! -e "${profiledir}/.DMDirc.jar" ]; then
-			UPDATEOK="1"
-		fi;
-	fi;
-	
-	if [ "${UPDATEOK}" = "1" ]; then
-		if [ "${UPDATEONLY}" = "1" ]; then
-			exit 0;
-		fi;
-		echo "Update successful."
-		messagedialog "Client Update" "Client Update successful"
-
-	else
-		if [ "${UID}" = "" ]; then
-			UID=`id -u`;
-		fi
-		if [ "0" != "${UID}" -a "1" = "${TRYROOT}" ]; then
-			if [ "${ISOSX}" = "1" ]; then
-				messagedialog "DMDirc" "The DMDirc Client Updater was unable to modify the client installation, trying again with administrator access"
-				if [ $? -eq 0 ]; then
-					echo "Password dialog on display"
-					# osascript -e "do shell script \"mv -fv \\\"${profiledir}/.DMDirc.jar\\\" \\\"${jar}\\\"\" with administrator privileges"
-					osascript -e "do shell script \"sh ${0} ${params} -d "${profiledir}" --updateonly\" with administrator privileges"
-				fi;
-			else
-				if [ "" != "${ISKDE}" -a "" != "${KSUDO}" -a "" != "${DISPLAY}" ]; then
-					echo "Password dialog on ${DISPLAY}"
-					# ${KSUDO} --comment "DMDirc Client Updater requires root access to modify the global installation" -- mv -fv "${profiledir}/.DMDirc.jar" "${jar}"
-					${KSUDO} --comment "DMDirc Client Updater requires root access to modify the global installation" -- sh ${0} ${params} -d "${profiledir}" --updateonly
-				elif [ "" != "${ISGNOME}" -a "" != "${GSUDO}" -a "" != "${DISPLAY}" ]; then
-					echo "Password dialog on ${DISPLAY}"
-					# ${GSUDO} -k --message "DMDirc Client Updater requires root access to modify the global installation" -- mv -fv "${profiledir}/.DMDirc.jar" "${jar}"
-					${GSUDO} -k --message "DMDirc Client Updater requires root access to modify the global installation" -- sh ${0} ${params} -d "${profiledir}" --updateonly
-				elif [ "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then	
-					sudo -k
-					${ZENITY} --entry --title="DMDirc" --text="DMDirc Client Updater requires root access to modify the global installation, please enter your password to continue." --entry-text="" --hide-text | sudo -S -- sh ${0} ${params} -d "${profiledir}" --updateonly
-				else
-					echo "DMDirc Client Updater requires root access to modify the global installation"
-					# sudo mv -fv "${profiledir}/.DMDirc.jar" "${jar}"
-					sudo sh ${0} ${params} -d "${profiledir}" --updateonly
-				fi;
-			fi;
-		elif [ "${UPDATEONLY}" = "1" ]; then
-			# Update failed as root, so give up.
-			echo "1" >> "${profiledir}/.updatefailed";
-			chmod 777 "${profiledir}/.updatefailed";
-			exit 1;
-		fi;
-		
-		if [ ! -e "${profiledir}/.updatefailed" ]; then
-			echo "Update successful."
-			messagedialog "Client Update" "Client Update successful"
-		else
-			rm -Rf ${profiledir}/.updatefailed;
-			echo "Update failed."
-			errordialog "Client Update" "Client Update failed, using old version"
-			if [ "${BSDIFF}" = "1" ]; then
-				# Run the client without bspatch support
-				LAUNCHERINFO=`echo ${LAUNCHERINFO} | sed 's/|bsdiff//'`
-			fi;
-		fi;
-	fi
-else
-	echo "Not found.";
-fi;
-
-if [ "${UPDATEONLY}" = "1" ]; then
-	exit 0;
-fi;
-
-relaunch() {
-	trap - INT TERM EXIT
-	echo ""
-	echo "============================================================="
-	echo "ERROR"
-	echo "============================================================="
-	echo "${HOME}/.profile has errors in it (or an 'exit' command)."
-	echo "Setup will now restart with the --noprofile option."
-	echo "============================================================="
-	sh ${0} ${params} --noprofile
-}
-
-echo -n "Looking for java - ";
-if [ "${ISOSX}" = "1" ]; then
-	JAVA=`which java`
-	if [ -e "/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands/java" ]; then
-		JAVA="/System/Library/Frameworks/JavaVM.framework/Versions/1.6.0/Commands/java"
-	elif [ -e "/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/java" ]; then
-		JAVA="/System/Library/Frameworks/JavaVM.framework/Versions/1.6/Commands/java"
-	fi;
-else
-	if [ -e "${HOME}/.profile" -a "${USEPROFILE}" = "1" ]; then
-		# Source the profile incase java can't be found otherwise
-		trap relaunch INT TERM EXIT
-		. ${HOME}/.profile
-		trap - INT TERM EXIT
-	fi;
-	JAVA=`which java`
-	if [ ! -e "${JAVA}" ]; then
-		# Location where ports on FreeBSD/PCBSD installs java6
-		# check it first, because it isn't added to the path automatically
-		JAVA=${BSDJava1}
-		if [ ! -e "${JAVA}" ]; then
-			# Try alternative BSD Location
-			JAVA=${BSDJava2}
-		fi;
-	fi;
-fi;
-
-if [ "" != "${JAVA}" ]; then
-	echo "Success! (${JAVA})"
-else
-	echo "Failed!"
-	ERROR="Sorry, java does not appear to be installed on this machine.";
-	ERROR=${ERROR}"\n"
-	if [ "${ISOSX}" = "1" ]; then
-		ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM.";
-	else
-		ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from: http://www.java.com";
-		ERROR=${ERROR}"\nor reinstall DMDirc and let the installer install one for you.";
-	fi;
-	errordialog "Unable to launch dmdirc!" "${ERROR}";
-	exit 1;
-fi
-
-echo -n "Running DMDirc - "
-if [ -e "${jar}" ]; then
-	# Check that DMDirc will run, if java is not 1.6 this will fail.
-	# We do it this way otherwise segfaults etc would cause an unable to launch
-	# error message to be printed.
-	${JAVA} -jar ${jar} --help >/dev/null 2>&1
-	if [ $? -ne 0 ]; then
-		FAILED=1
-		# If we are on BSD, check to see if there is alternative versions of java
-		# than the one in the path.
-		if [ "`echo ${KERNEL} | grep -i BSD`" != "" ]; then
-			if [ "${JAVA}" != "${BSDJava1}" -a "${JAVA}" != "${BSDJava2}" ]; then
-				JAVA=${BSDJava1}
-				if [ ! -e "${JAVA}" ]; then
-					JAVA=${BSDJava2}
-				fi;
-				# Now check to see if DMDirc runs again.
-				${JAVA} -jar ${jar} --help >/dev/null 2>&1
-				if [ $? -eq 0 ]; then
-					# It runs!
-					FAILED=0
-				fi;
-			fi;
-		fi;
-		if [ ${FAILED} -eq 1 ]; then
-			echo "Failed."
-			ERROR="Sorry, the currently installed version of java is not compatible with DMDirc.";
-			ERROR=${ERROR}"\n";
-			if [ "${ISOSX}" = "1" ]; then
-				ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM.";
-			else
-				ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from: http://www.java.com";
-				ERROR=${ERROR}"\nor reinstall DMDirc and let the installer install one for you.";
-			fi;
-			errordialog "Unable to launch dmdirc!" "${ERROR}";
-			exit 1;
-		fi;
-	fi
-
-	# Now we can run the client for real, this allows stderr/stdout output
-	# to be seen, and the shell script exits with the correct exit code.
-	APPLEOPTS=""
-	if [ "${ISOSX}" = "1" ]; then
-		APPLEOPTS="${APPLEOPTS} -Djava.library.path=${jarDir}"
-		#APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.growbox.intrudes=false"
-		#APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.live-resize=true"
-		APPLEOPTS="${APPLEOPTS} -Dcom.apple.mrj.application.apple.menu.about.name=DMDirc"
-		#APPLEOPTS="${APPLEOPTS} -Dapple.awt.showGrowBox=true"
-		#APPLEOPTS="${APPLEOPTS} -Dapple.laf.useScreenMenuBar=true"
-	fi;
-	${JAVA}${APPLEOPTS} -ea -jar ${jar} -l ${LAUNCHERINFO} ${params}
-	EXITCODE=${?}
-	if [ ${EXITCODE} -eq 42 ]; then
-		# The client says we need to up update, rerun ourself before exiting.
-		${0} ${params}
-	fi;
-	exit ${EXITCODE};
-else
-	echo "Failed.";
-	errordialog "Unable to launch dmdirc!" "No jar file found";
-fi

launcher/windows/DMDirc.dpr

@@ -1,169 +0,0 @@
-{*
- * This application launches DMDirc on windows and passes control to the
- * update engine as necessary.
- *
- * DMDirc - Open Source IRC Client
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes,
- * Michael Nixon
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *}
-program DMDirc;
-{$MODE Delphi}
-{$APPTYPE GUI}
-
-{$R comctl.rc}
-{$R icon.rc}
-{$R version.rc}
-
-uses Vista, shared, Windows, SysUtils, classes, StrUtils;
-procedure InitCommonControls; stdcall; External 'comctl32.dll' name 'InitCommonControls';
-{ ---------------------------------------------------------------------------- }
-
-{ ----------------------------------------------------------------------------
-  MAIN PROGRAM
-  ---------------------------------------------------------------------------- }
-const
-  launcherVersion: String = '4';
-var
-  errorMessage: String;
-  cliParams: String = '';
-  directory: String = '';
-  i: integer;
-  jarName: String;
-  launcherUpdate: boolean = false;
-  result: integer;
-  s: string;
-  handle: thandle;
-begin
-  InitCommonControls;
-
-  { Check for a mutex created by the DMDirc update process. Wait until it no
-    longer exists before we continue. This prevents us from proceeding if any
-    previous instance of the launcher is shutting down. }
-  handle := OpenMutex(SYNCHRONIZE, False, 'DMDirc_Launcher_Restart_Wait');
-  if handle <> 0 then begin
-    { The mutex exists. Wait for it for up to 5 seconds. }
-    if WaitForSingleObject(handle, 5000) = WAIT_TIMEOUT then begin
-      { Timed out - we cannot continue, there is some kind of serious issue? }
-      showError('Internal error: Timed out waiting for previous instance of launcher to stop during restart upgrade', 'DMDirc', true, true);
-      exit;
-    end;
-    { If we get to here, the mutex has been released and we can continue }
-    CloseHandle(handle);
-  end;
-
-  jarName := ExtractFileDir(paramstr(0))+'\DMDirc.jar';
-
-  directory := GetEnvironmentVariable('APPDATA')+'\DMDirc';
-  if ParamCount > 0 then begin
-    for i := 1 to ParamCount do begin
-      if AnsiContainsStr(cliParams, ' ') then cliParams := cliParams+' "'+paramstr(i)+'"'
-      else cliParams := cliParams+' '+paramstr(i);
-      if (paramstr(i) = '-d') or (paramstr(i) = '--directory') then begin
-        if ParamCount > i then begin
-          directory := paramstr(i+1);
-        end;
-      end
-    end;
-  end;
-
-  // Update if needed.
-  launcherUpdate := FileExists(directory+'\.DMDirc.exe') and FileExists(directory+'\.DMDircUpdater.exe');
-  if FileExists(directory+'\.DMDirc.jar') or launcherUpdate then begin
-    // Vista Sucks.
-    if IsWindowsVista then begin
-      // Vista >.<
-      // Try and delete the old file, if it fails then the user needs to give
-      // us permission to delete the file (UAC), otherwise we can just go ahead
-      // and run the updater.
-      if not DeleteFile(pchar(jarName)) then begin
-        errorMessage := 'An update to DMDirc has been previously downloaded. ';
-        errorMessage := errorMessage+#13#10;
-        errorMessage := errorMessage+#13#10+'As you are running Windows Vista, DMDirc requires administrator access to ';
-        errorMessage := errorMessage+#13#10+'complete the update. ';
-        errorMessage := errorMessage+#13#10;
-        errorMessage := errorMessage+#13#10+'Please click ''Allow'' on the UAC prompt to complete the update, or click no ';
-        errorMessage := errorMessage+#13#10+'here to continue without updating. ';
-        if askQuestion(errorMessage, 'DMDirc') then begin
-          RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
-        end;
-      end
-      else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
-    end
-    else RunProgram('"'+ExtractFileDir(paramstr(0))+'\DMDircUpdater.exe" --UpdateSourceDir "'+directory+'"', not launcherUpdate);
-  end;
-
-  if not launcherUpdate then begin
-    // Check JVM
-    if (RunJava('-version') <> 0) then begin
-      errorMessage := 'No JVM is currently installed.';
-      errorMessage := errorMessage+#13#10;
-      errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
-      errorMessage := errorMessage+#13#10+'http://java.com/';
-      showError(errorMessage, 'DMDirc', true);
-    end
-    // Else try and run client. (This only asks for help output to check that client
-    // runs on this OS, otherwise later segfaults or so would cause the error to
-    // appear
-    else if FileExists(jarName) then begin
-      if (RunJava('-jar "'+jarName+'" --help') <> 0) then begin
-        errorMessage := 'The currently installed version of java is not compatible with DMDirc.';
-        errorMessage := errorMessage+#13#10;
-        errorMessage := errorMessage+#13#10+'DMDirc requires a 1.6.0 compatible JVM, you can get one from:';
-        errorMessage := errorMessage+#13#10+'http://java.com/';
-        showError(errorMessage, 'DMDirc', True);
-      end
-      else begin
-        { Need to wait so we can deal with exit code 42 to restart }
-        result := RunJava('-ea -jar "'+jarName+'"'+' -l windows-'+launcherVersion+' '+cliParams);
-        if result = 42 then begin
-          { Need to restart DMDirc launcher
-            We can't just rerun the EXE because it is possible for the new
-            process to launch the updater and try to replace this EXE before
-            the current thread ends - remote but possible. We deal with this
-            case by creating a mutex that this program will spin on when it
-            restarts until this instance ends. }
-          handle := CreateMutex(nil, True, 'DMDirc_Launcher_Restart_Wait');
-          if handle = 0 then begin
-            showError('Internal error: Failed to create restart mutex', 'DMDirc', true, true);
-            exit;
-          end;
-
-          { Build new command line }
-          s := '';
-          for i := 1 to paramcount do begin
-            if pos(' ', paramstr(i)) <> 0 then s := s + '"' + paramstr(i) + '"' else
-              s := s + paramstr(i);
-            if i < paramcount then s := s + ' ';
-          end;
-
-          { Launch self }
-          Launch('"' + paramstr(0)+ '" ' + s);
-        end;
-      end;
-    end
-    else begin
-      errorMessage := 'A file required to start DMDirc is missing. Please re-install DMDirc to rectify the problem.';
-      errorMessage := errorMessage+#13#10;
-      errorMessage := errorMessage+#13#10 + 'File: DMDirc.jar';
-      showError(errorMessage, 'DMDirc');
-    end;
-  end;
-end.

launcher/windows/DMDircUpdater.dpr

@@ -1,131 +0,0 @@
-{*
- * Updates DMDirc windows components
- *
- * DMDirc - Open Source IRC Client
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes,
- * Michael Nixon
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- *}
-program DMDircUpdater;
-{$MODE Delphi}
-{$APPTYPE GUI}
-
-{$R UAC.rc}
-
-uses Vista, shared, Windows, SysUtils, classes, StrUtils;
-procedure InitCommonControls; stdcall; External 'comctl32.dll' name 'InitCommonControls';
-{ ---------------------------------------------------------------------------- }
-
-{ ----------------------------------------------------------------------------
-  MAIN PROGRAM
-  ---------------------------------------------------------------------------- }
-var
-  sourceDir: String = '';
-  thisDir: String;
-  cliParams: String = '';
-  i: integer;
-  jarName: String;
-  launcherUpdate: boolean = false;
-  myName: String;
-  canDoMore: boolean = true;
-begin
-  InitCommonControls;
-
-  myName := ExtractFileName(paramstr(0));
-  thisDir := ExtractFileDir(paramstr(0));
-  jarName := thisDir+'\DMDirc.jar';
-
-  if ParamCount > 0 then begin
-    for i := 1 to ParamCount do begin
-      if AnsiContainsStr(cliParams, ' ') then cliParams := cliParams+' "'+paramstr(i)+'"'
-      else cliParams := cliParams+' '+paramstr(i);
-      if (paramstr(i) = '--UpdateSourceDir') then begin // Source Directory
-        if ParamCount > i then begin
-          sourceDir := paramstr(i+1);
-        end;
-      end
-    end;
-
-    // Look for a launcher update.
-    if FileExists(pchar(sourceDir+'\.DMDirc.exe')) and FileExists(pchar(sourceDir+'\.DMDircUpdater.exe')) then begin
-      if myName = 'DMDircUpdater.exe' then begin
-        // Windows won't let us overwrite ourself, so we need to copy ourself
-        // to another name, and run the new us.
-        if CopyFile(pchar(thisDir+'\DMDircUpdater.exe'), pchar(thisDir+'\DMDircLauncherUpdater.exe'), False) then begin
-          canDoMore := false;
-          Launch('"'+thisDir+'\DMDircLauncherUpdater.exe" '+cliParams);
-        end
-        else begin
-          showmessage('Unable to overwrite launcher', 'DMDirc', 'Update Failed');
-        end;
-      end
-      else begin
-        launcherUpdate := true;
-        if FileExists(pchar(thisDir+'\DMDirc.exe')) then begin
-          if not DeleteFile(pchar(thisDir+'\DMDirc.exe')) then begin
-            showmessage('Unable to delete DMDirc.exe', 'DMDirc', 'Launcher Update Failed');
-          end;
-        end;
-        
-        if not FileExists(pchar(thisDir+'\DMDirc.exe')) and MoveFile(pchar(sourceDir+'\.DMDirc.exe'), pchar(thisDir+'\DMDirc.exe')) then begin
-          if FileExists(pchar(thisDir+'\DMDircUpdater.exe')) then begin
-            if not DeleteFile(pchar(thisDir+'\DMDircUpdater.exe')) then begin
-              showmessage('Unable to delete DMDircUpdater.exe', 'DMDirc', 'Launcher Update Failed');
-            end;
-          end;
-          if not FileExists(pchar(thisDir+'\DMDircUpdater.exe')) and MoveFile(pchar(sourceDir+'\.DMDircUpdater.exe'), pchar(thisDir+'\DMDircUpdater.exe')) then begin
-            showmessage('Launcher update was successful', 'DMDirc');
-          end
-          else begin
-            showmessage('Unable to update DMDircUpdater.exe', 'DMDirc', 'Launcher Update Failed');
-          end;
-        end
-        else begin
-          showmessage('Unable to update DMDirc.exe', 'DMDirc', 'Launcher Update Failed');
-        end;
-      end;
-    end;
-
-    // Look for client update
-    if canDoMore then begin
-      if FileExists(pchar(sourceDir+'\.DMDirc.jar')) then begin
-        if FileExists(pchar(jarName)) then begin
-          if not DeleteFile(pchar(jarName)) then begin
-            showmessage('Unable to update DMDirc.jar', 'DMDirc', 'Launcher Update Failed');
-          end;
-        end;
-
-        if MoveFile(pchar(sourceDir+'\.DMDirc.jar'), pchar(jarName)) then begin
-          showmessage('Client update was successful', 'DMDirc');
-        end
-        else begin
-          showmessage('Unable to move '''+sourceDir+'\.DMDirc.jar'' to '+jarName, 'DMDirc', 'Update Failed');
-        end;
-      end;
-      
-      if launcherUpdate then begin
-        showmessage('The DMDirc launcher has been updated, to complete the update please relaunch DMDirc.', 'DMDirc', 'Restart Required');
-      end;
-    end;
-  end
-  else begin
-    showError('This program can not be run on its own.', 'DMDirc');
-  end;
-end.

launcher/windows/comctl.manifest

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> 
-  <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="DMDirc Updater" type="win32"/>
-  <description>DMDirc Updater</description>
-  <dependency>
-    <dependentAssembly>
-      <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="X86" publicKeyToken="6595b64144ccf1df" language="*"/>
-    </dependentAssembly>
-  </dependency>
-</assembly>

launcher/windows/comctl.rc

@@ -1 +0,0 @@
-1 24 "comctl.manifest"

launcher/windows/compile.sh

@@ -1,29 +0,0 @@
-#!/bin/sh
-rm UAC.manifest UAC.rc
-if [ ! -e ../../installer/windows/UAC.rc ]; then
-	echo "1 24 \"UAC.manifest\"" > UAC.rc
-	cp ../../installer/windows/UAC.manifest .
-else
-	cp ../../installer/windows/UAC.manifest ../../installer/windows/UAC.rc .
-fi;
-
-if [ ! -e ./icon.ico ]; then
-	ln -sf "../../src/com/dmdirc/res/icon.ico" ./icon.ico
-fi
-
-rm -Rf ./*.exe
-PWDIR="${PWD}"
-# Windows binaries need real paths not cygwin-y pathhs.
-if [ "${WINDIR}" != "" ]; then
-	PWDIR=`echo "${PWDIR}" | sed 's#^/c/#c:/#'`
-fi;
-compilerFlags="-Xs -XX -O2 -Or -Op1"
-extraFlags="-Fu${PWDIR}/../../libwin"
-fpc -Sd -Twin32 ${compilerFlags} ${extraFlags} DMDirc.dpr
-fpc -Sd -Twin32 ${compilerFlags} ${extraFlags} DMDircUpdater.dpr
-rm -Rf ./*.o ./*.or ./*.ppu
-if [ -e DMDircUpdater.exe -a -e DMDirc.exe ]; then
-	exit 0;
-else
-	exit 1;
-fi

launcher/windows/icon.rc

@@ -1 +0,0 @@
-icon.ico ICON icon.ico

launcher/windows/version.rc

@@ -1,27 +0,0 @@
-1 VERSIONINFO
-FILEVERSION 1, 0, 0, 0
-PRODUCTVERSION 1, 0, 0, 0
-FILEFLAGSMASK 0x000A
-FILEFLAGS 0x3f
-FILEOS 0x40004
-FILETYPE 1
-BEGIN
-	BLOCK "StringFileInfo"
-	BEGIN
-		BLOCK "040004E4"
-		BEGIN
-			VALUE "Comments", "http://www.dmdirc.com/"
-			VALUE "CompanyName", "DMDirc"
-			VALUE "FileDescription", "Launcher for DMDirc"
-			VALUE "FileVersion", "2.0"
-			VALUE "InternalName", "DMDirc.exe"
-			VALUE "LegalCopyright", "Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes"
-			VALUE "OriginalFilename", "$2"
-			VALUE "ProductName", "DMDirc Launcher"
-		END
-	END
-	BLOCK "VarFileInfo"
-	BEGIN
-		VALUE "Translation", 0x400, 1252
-	END
-END

src/com/dmdirc/installer/DefaultSettings.java

@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import com.dmdirc.installer.cliparser.CLIParser;
-
-/**
- * Default settings for the installer.
- */
-public class DefaultSettings implements Settings {
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutMenuState() {
-        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu")
-                == 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutDesktopState() {
-        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop")
-                == 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutQuickState() {
-        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-quicklaunch")
-                == 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutProtocolState() {
-        return CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol")
-                == 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getInstallLocation() {
-        return Main.getInstaller().defaultInstallLocation();
-    }
-}

src/com/dmdirc/installer/Installer.java

@@ -1,257 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import com.dmdirc.installer.cliparser.CLIParser;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.FilenameFilter;
-import java.io.IOException;
-import java.nio.channels.FileChannel;
-
-/**
- * Installs DMDirc.
- */
-public abstract class Installer extends Thread {
-
-    /** Types of shortcut. */
-    public static enum ShortcutType {
-
-        /** Desktop shortcut. */
-        DESKTOP,
-        /** Menu (start/k/etc) shortcut. */
-        MENU,
-        /** Quick launch shortcut. */
-        QUICKLAUNCH,
-        /** The actual uninstaller (not a shortcut, as far as I can tell). */
-        UNINSTALLER,
-        /** Associate DMDirc with the irc:// protocol (not a shortcut). */
-        PROTOCOL;
-    }
-
-    /** Step where the installation output should be. */
-    protected TextStep step;
-
-    /**
-     * Create a new Installer.
-     */
-    public Installer() {
-        super("Installer-Thread");
-    }
-
-    /**
-     * Get the default install location.
-     *
-     * @return The default install location
-     */
-    public abstract String defaultInstallLocation();
-
-    /**
-     * This is what helps actually perform the installation in run().
-     * This is a hack to keep the installing and the GUI separate.
-     *
-     * @param step The step that called this
-     */
-    public final void setInstallStep(final TextStep step) {
-        this.step = step;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public final void run() {
-        step.setText("Beginning Install..\n");
-
-        final boolean isUnattended = (CLIParser.getCLIParser().getParamNumber(
-                "-unattended") != 0);
-        final Settings settings = (isUnattended) ? new DefaultSettings() : ((Settings) Main.getWizardFrame().
-                getStep(1));
-
-        final String location = settings.getInstallLocation();
-        step.addText("Installing files to: " + location);
-        if (!doSetup(location)) {
-            step.addText("");
-            step.addText("Installation failed\n");
-            Main.getWizardFrame().enableNextStep(true);
-            return;
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
-            if (settings.getShortcutMenuState()) {
-                step.addText("Setting up " + Main.getInstaller().getMenuName()
-                        + " shortcut");
-                setupShortcut(location, ShortcutType.MENU);
-            } else {
-                step.addText("Not setting up "
-                        + Main.getInstaller().getMenuName() + " shortcut");
-            }
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
-            if (settings.getShortcutDesktopState()) {
-                step.addText("Setting up Desktop shortcut");
-                setupShortcut(location, ShortcutType.DESKTOP);
-            } else {
-                step.addText("Not setting up Desktop shortcut");
-            }
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
-            if (settings.getShortcutQuickState()) {
-                step.addText("Setting up Quick Launch shortcut");
-                setupShortcut(location, ShortcutType.QUICKLAUNCH);
-            } else {
-                step.addText("Not setting up Quick Launch shortcut");
-            }
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.UNINSTALLER)) {
-            step.addText("Creating uninstaller");
-            setupShortcut(location, ShortcutType.UNINSTALLER);
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
-            if (settings.getShortcutProtocolState()) {
-                step.addText("Setting up irc:// handler");
-                setupShortcut(location, ShortcutType.PROTOCOL);
-            } else {
-                step.addText("Not setting up irc:// handler");
-            }
-        }
-
-        postInstall(location);
-
-        step.addText("");
-        step.addText("Installation finished\n");
-        Main.getWizardFrame().enableNextStep(true);
-    }
-
-    /**
-     * Is the given file name vaild to copy to the installation directory?
-     *
-     * @param filename File to check
-     * @return true If the file should be copied, else false.
-     */
-    public abstract boolean validFile(final String filename);
-
-    /**
-     * Main Setup stuff.
-     *
-     * @param location Location where app will be installed to.
-     * @return True if installation passed, else false
-     */
-    public boolean doSetup(final String location) {
-        // Create the directory
-        final File directory = new File(location);
-        if (!directory.exists()) {
-            directory.mkdir();
-        }
-
-        try {
-            final File dir = new File(".");
-            final FilenameFilter filter = new FilenameFilter() {
-
-                /** {@inheritDoc} */
-                @Override
-                public boolean accept(final File dir, final String name) {
-                    return name.charAt(0) != '.' && validFile(name);
-                }
-            };
-            final String[] children = dir.list(filter);
-            if (children != null) {
-                for (String filename : children) {
-                    step.addText("Copying " + filename);
-                    copyFile(filename, location + File.separator + filename);
-                }
-            }
-        } catch (IOException e) {
-            step.addText("Error copying files: " + e.getMessage());
-            return false;
-        }
-        step.addText("File Copying Complete.");
-        return true;
-    }
-
-    /**
-     * Check if this OS supports a given shortcut Type.
-     *
-     * @param shortcutType Type of shortcut to check
-     * @return True if this OS supports a given shortcut Type
-     */
-    public boolean supportsShortcut(final ShortcutType shortcutType) {
-        return false;
-    }
-
-    /**
-     * Check what name to show for the menu shortcut
-     *
-     * @return Name for menu shortcutType
-     */
-    public String getMenuName() {
-        return "menu";
-    }
-
-    /**
-     * Setup shortcut.
-     *
-     * @param location Location where app will be installed to.
-     * @param shortcutType Type of shortcut to add.
-     */
-    protected abstract void setupShortcut(final String location,
-                                          final ShortcutType shortcutType);
-
-    /**
-     * Copy a file from one location to another.
-     * Based on http://www.exampledepot.com/egs/java.io/CopyFile.html
-     *
-     * @param srcFile Original file
-     * @param dstFile New file
-     * @throws java.io.IOException If an exception occurs while copying
-     */
-    protected final void copyFile(final String srcFile, final String dstFile)
-            throws IOException {
-        if (new File(srcFile).exists()) {
-            final FileChannel srcChannel = new FileInputStream(srcFile).
-                    getChannel();
-            final FileChannel dstChannel = new FileOutputStream(dstFile).
-                    getChannel();
-
-            dstChannel.transferFrom(srcChannel, 0, srcChannel.size());
-
-            srcChannel.close();
-            dstChannel.close();
-        } else {
-            throw new IOException(srcFile + " does not exist.");
-        }
-    }
-
-    /**
-     * Any post-install tasks should be done here.
-     *
-     * @param location Location where app was installed to.
-     */
-    public void postInstall(final String location) {
-        // Nothing to do by default, installers may override
-    }
-}

src/com/dmdirc/installer/InstallerListener.java

@@ -1,133 +0,0 @@
-/*
- *
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import com.dmdirc.installer.Installer.ShortcutType;
-import com.dmdirc.installer.ui.InstallerDialog;
-
-/**
- * Listeners to all wizard and step changes and responds accordingly.
- */
-public class InstallerListener implements WizardListener, StepListener {
-
-    private Main main;
-
-    /**
-     * Instantiates a new installer listener.
-     *
-     * @param main Installer entry point
-     */
-    public InstallerListener(final Main main) {
-        this.main = main;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void wizardFinished() {
-        main.disposeOfInstaller();
-        Main.getWizardFrame().dispose();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void wizardCancelled() {
-        if (!"Install".equals(Main.getWizardFrame().getCurrentStepName()) && Main.getWizardFrame().
-                showCancelConfirmation()) {
-            Main.getWizardFrame().dispose();
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void stepAboutToDisplay(final Step step) {
-        if ("Install".equals(step.getStepName())) {
-            installerToBeDisplayed(step);
-        } else if ("Confirm".equals(step.getStepName())) {
-            confirmToBeDisplayed(step);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void stepHidden(final Step step) {
-        //Ignore
-    }
-
-    private void installerToBeDisplayed(final Step step) {
-        final InstallerDialog dialog = Main.getWizardFrame();
-        dialog.enableNextStep(false);
-        dialog.enablePreviousStep(false);
-        Main.getInstaller().setInstallStep((TextStep) dialog.getStep("Install"));
-        Main.getInstaller().start();
-    }
-
-    private void confirmToBeDisplayed(final Step step) {
-        String shortcutText = "";
-
-        final Settings settings = (Settings) Main.getWizardFrame().getStep(1);
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.MENU) && settings.
-                getShortcutMenuState()) {
-            shortcutText = shortcutText + " - Create " + Main.getInstaller().
-                    getMenuName() + " shortcut\n";
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)
-                && settings.getShortcutDesktopState()) {
-            shortcutText = shortcutText + " - Create desktop shortcut\n";
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)
-                && settings.getShortcutQuickState()) {
-            shortcutText = shortcutText + " - Create Quick Launch shortcut\n";
-        }
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)
-                && settings.getShortcutProtocolState()) {
-            shortcutText = shortcutText + " - Make DMDirc handle irc:// links\n";
-        }
-
-
-        final String installLocation = settings.getInstallLocation();
-
-
-        if (step instanceof TextStep) {
-            final TextStep textStep = (TextStep) step;
-            if (installLocation.isEmpty()) {
-                textStep.setText(
-                        "You have chosen an invalid install location\n\n"
-                        + "Please press the \"Previous\" button to go back and correct it.");
-               Main.getWizardFrame().enableNextStep(false);
-            } else {
-                textStep.setText(
-                        "Please review your chosen settings:\n\n"
-                        + " - Install Location:\n" + "    " + installLocation
-                        + "\n" + shortcutText + "\n" + "If you wish to change "
-                        + "any of these settings, press the \"Previous\" "
-                        + "button, otherwise click \"Next\" to begin the installation");
-                Main.getWizardFrame().enableNextStep(true);
-           }
-        }
-    }
-}

src/com/dmdirc/installer/LinuxInstaller.java

@@ -1,282 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import com.dmdirc.installer.cliparser.CLIParser;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-
-/**
- * Installs DMDirc on linux
- * 
- * @author Shane Mc Cormack
- */
-public class LinuxInstaller extends Installer {
-    /**
-     * Are we running as root?
-     * 
-     * @return true iif running as root
-     */
-    private boolean isRoot() {
-        return CLIParser.getCLIParser().getParamNumber("-isroot") > 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean validFile(final String filename) {
-        return !filename.equalsIgnoreCase("setup.sh")
-                && !filename.equalsIgnoreCase("getjre.sh")
-                && !filename.equalsIgnoreCase("jre.bin")
-                && !filename.equalsIgnoreCase("java-bin")
-                && !filename.equalsIgnoreCase("progressbar.sh")
-                && !filename.equalsIgnoreCase("installjre.sh")
-                && !filename.matches(".*pipe.*");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String defaultInstallLocation() {
-        String result = "";
-        if (CLIParser.getCLIParser().getParamNumber("-directory") > 0) {
-            return CLIParser.getCLIParser().getParam("-directory")
-                    .getStringValue();
-        }
-        if (result.isEmpty()) {
-            if (isRoot()) {
-                result = "/opt/dmdirc";
-            } else {
-                result = System.getProperty("user.home") + "/DMDirc";
-            }
-        }
-        return result;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean supportsShortcut(final ShortcutType shortcutType) {
-        switch (shortcutType) {
-            case QUICKLAUNCH:
-                return false;
-            case DESKTOP:
-                // No desktop for root
-                return !isRoot();
-            case PROTOCOL:
-            case UNINSTALLER:
-            case MENU:
-                // Both root and non-root have a menu, uninstaller, and protocol
-                return true;
-            default:
-                // Anything else that gets added should be false until the
-                // relevent
-                // code is added
-                return false;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setupShortcut(final String location,
-            final ShortcutType shortcutType) {
-        if (!supportsShortcut(shortcutType)) {
-            step
-                    .addText(" - Error creating shortcut. Not applicable to this Operating System");
-            return;
-        }
-
-        PrintWriter writer = null;
-        try {
-            String filename = "";
-            String command = "";
-
-            switch (shortcutType) {
-                case DESKTOP:
-                    filename = System.getProperty("user.home")
-                            + "/Desktop/DMDirc.desktop";
-                    break;
-
-                case MENU:
-                    if (isRoot()) {
-                        filename = "/usr/share/applications/DMDirc.desktop";
-                    } else {
-                        filename = System.getProperty("user.home")
-                                + "/.local/share/applications/DMDirc.desktop";
-                    }
-                    break;
-
-                case UNINSTALLER:
-                    // Write config for uninstaller
-                    writer = new PrintWriter(location + "/.uninstall.conf");
-                    writer.println("#!/bin/sh");
-                    writer.println("# DMDirc Uninstaller Settings");
-                    writer.println("INSTALLED_AS_ROOT="
-                            + (isRoot() ? "1" : "0"));
-                    writer.println("INSTALL_LOCATION=" + location);
-
-                    // Make sure uninstaller is executeable
-                    new File(location + "/uninstall.sh").setExecutable(true);
-                    return;
-
-                case PROTOCOL:
-                    if (isRoot()) {
-                        command = "${TOOL} --config-source=`${TOOL} --get-default-source`";
-                        filename = "/usr/share/services/";
-                    } else {
-                        command = "${TOOL}";
-                        filename = "${HOME}/.kde/share/services/";
-                    }
-
-                    writer = new PrintWriter(location + "/protocolHandlers.sh");
-                    writer.println("#!/bin/sh");
-                    writer.println("TOOL=`which gconftool-2`");
-                    writer.println("if [ \"${TOOL}\" != \"\" ]; then");
-                    writer
-                            .println("\t"
-                                    + command
-                                    + " --set --type=bool /desktop/gnome/url-handlers/irc/enabled true");
-                    writer
-                            .println("\t"
-                                    + command
-                                    + " --set --type=string /desktop/gnome/url-handlers/irc/command \"\\\""
-                                    + location + "/DMDirc.sh\\\" -e -c %s\"");
-                    writer
-                            .println("\t"
-                                    + command
-                                    + " --set --type=bool /desktop/gnome/url-handlers/irc/need-terminal false");
-                    writer.println("fi");
-                    writer.println("if [ ! -e \"" + filename + "\" ]; then");
-                    writer.println("\tmkdir -p \"" + filename + "\"");
-                    writer.println("fi");
-                    writer.println("echo \"[Protocol]\" > " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"exec=\"" + location
-                            + "/DMDirc.sh\" -e -c %u\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"protocol=irc\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"input=none\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"output=none\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"helper=true\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"listing=false\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"reading=false\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"writing=false\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"makedir=false\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("echo \"deleting=false\" >> " + filename
-                            + "irc.protocol");
-                    writer.println("chmod a+x " + filename + "irc.protocol");
-                    writer.println("exit 0;");
-                    writer.close();
-
-                    final File protocolFile = new File(location
-                            + "/protocolHandlers.sh");
-                    protocolFile.setExecutable(true);
-
-                    try {
-                        final Process gconfProcess = Runtime.getRuntime().exec(
-                                new String[] { "/bin/sh",
-                                        location + "/protocolHandlers.sh" });
-                        new StreamReader(gconfProcess.getInputStream()).start();
-                        new StreamReader(gconfProcess.getErrorStream()).start();
-                        try {
-                            gconfProcess.waitFor();
-                        } catch (final InterruptedException e) {
-                        }
-                        protocolFile.delete();
-                    } catch (final SecurityException e) {
-                        step.addText(" - Error adding Protocol Handler: "
-                                + e.getMessage());
-                    } catch (final IOException e) {
-                        step.addText(" - Error adding Protocol Handler: "
-                                + e.getMessage());
-                    }
-                    return;
-
-                default:
-                    step
-                            .addText(" - Error creating shortcut. Not applicable to this Operating System");
-                    return;
-            }
-            final File outFile = new File(filename);
-            if (!outFile.getParentFile().exists()) {
-                outFile.getParentFile().mkdir();
-            }
-            writer = new PrintWriter(outFile);
-            writeFile(writer, location);
-
-            outFile.setExecutable(true);
-        } catch (final IOException e) {
-            step.addText(" - Error creating shortcut: " + e.toString());
-        } catch (final SecurityException e) {
-            step.addText(" - Error creating shortcut: " + e.toString());
-        } finally {
-            if (writer != null) {
-                writer.close();
-            }
-        }
-    }
-
-    /**
-     * Write the .desktop file
-     * 
-     * @param writer
-     *            PrintWriter to write to
-     * @param location
-     *            Location of installed files
-     * @throws IOException
-     *             if an error occurs when writing
-     */
-    private void writeFile(final PrintWriter writer, final String location)
-            throws IOException {
-        writer.println("[Desktop Entry]");
-        writer.println("Categories=Network;IRCClient;");
-        writer.println("Comment=DMDirc IRC Client");
-        writer.println("Encoding=UTF-8");
-        // writer.println("Exec=java -jar "+location+"/DMDirc.jar");
-        writer.println("Exec=" + location + "/DMDirc.sh");
-        writer.println("GenericName=IRC Client");
-        writer.println("Icon=" + location + "/icon.svg");
-        if (isRoot()) {
-            writer.println("Name=DMDirc (Global)");
-        } else {
-            writer.println("Name=DMDirc");
-        }
-        writer.println("StartupNotify=true");
-        writer.println("Terminal=false");
-        writer.println("TerminalOptions=");
-        writer.println("Type=Application");
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void postInstall(final String location) {
-        new File(location + "/DMDirc.sh").setExecutable(true, !isRoot());
-    }
-}

src/com/dmdirc/installer/Main.java

@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import com.dmdirc.installer.cliparser.BooleanParam;
-import com.dmdirc.installer.cliparser.CLIParser;
-import com.dmdirc.installer.cliparser.StringParam;
-import com.dmdirc.installer.ui.InstallerDialog;
-import com.dmdirc.installer.ui.StepConfirm;
-import com.dmdirc.installer.ui.StepError;
-import com.dmdirc.installer.ui.StepInstall;
-import com.dmdirc.installer.ui.StepSettings;
-import com.dmdirc.installer.ui.StepWelcome;
-
-/**
- * Main installer entry point.
- */
-public final class Main {
-
-    /** Wizard dialog. */
-    private static InstallerDialog wizardDialog;
-    /** Installer. */
-    private static Installer myInstaller;
-    /** CLI Parser. */
-    private static CLIParser cli = CLIParser.getCLIParser();
-
-    /**
-     * Creates and Displays the Installer wizard.
-     */
-    private Main() {
-        try {
-            InstallerDialog.initUISettings();
-        } catch (UnsupportedOperationException ex) {
-            //Ignore, revert to default
-        }
-
-        String releaseName = "DMDirc";
-        if (cli.getParamNumber("-release") > 0) {
-            releaseName = releaseName + " " + cli.getParam("-release").
-                    getStringValue();
-        }
-
-        setWizardFrame(new InstallerDialog(releaseName + " Installer"));
-        getWizardFrame().addWizardListener(new InstallerListener(this));
-        getWizardFrame().addStepListener(new InstallerListener(this));
-
-        final String osName = System.getProperty("os.name");
-        wizardDialog.addStep(new StepWelcome(releaseName));
-        if (osName.startsWith("Mac OS")) {
-            wizardDialog.addStep(
-                    new StepError(
-                    "Sorry, OSX Installation should be done using the downloadable dmg file, not this installer.\n\n"));
-        } else {
-            if (CLIParser.getCLIParser().getParamNumber("-unattended") == 0) {
-                wizardDialog.addStep(new StepSettings());
-                wizardDialog.addStep(new StepConfirm());
-            }
-            wizardDialog.addStep(new StepInstall());
-        }
-    }
-
-    /**
-     * Disposes of the current installer.
-     */
-    public void disposeOfInstaller() {
-        final Thread temp = myInstaller;
-        myInstaller = null;
-        if (temp != null) {
-            temp.interrupt();
-        }
-    }
-
-    /**
-     * Get the Installer object for this OS.
-     *
-     * @return The installer for this OS
-     */
-    public static synchronized Installer getInstaller() {
-        if (myInstaller == null) {
-            final String osName = System.getProperty("os.name");
-            if (osName.startsWith("Windows")) {
-                myInstaller = new WindowsInstaller();
-            } else if(!osName.startsWith("Mac OS")) {
-                myInstaller = new LinuxInstaller();
-            }
-        }
-
-        return myInstaller;
-    }
-
-    /**
-     * Setup the cli parser.
-     * This clears the current CLIParser params and creates new ones.
-     */
-    private static void setupCLIParser() {
-        cli.clear();
-        cli.add(new StringParam('h', "help", "Get Help"));
-        cli.setHelp(cli.getParam("-help"));
-        cli.add(new BooleanParam((char) 0, "isroot", "Installing as Root"));
-        cli.add(new StringParam('r', "release", "Release Name"));
-        cli.add(new StringParam('d', "directory", "Default install directory"));
-        cli.add(new BooleanParam('u', "unattended",
-                                 "Perform an unattended installation"));
-        cli.add(new BooleanParam((char) 0, "no-shortcut-desktop",
-                                 "Don't offer a desktop shortcut as the default"));
-        cli.add(new BooleanParam((char) 0, "no-shortcut-menu",
-                                 "Don't offer a menu shortcut as the default"));
-        cli.add(new BooleanParam((char) 0, "no-shortcut-quicklaunch",
-                                 "Don't offer a quick launch shortcut as the default"));
-        cli.add(new BooleanParam((char) 0, "no-shortcut-protocol",
-                                 "Don't offer to handle irc:// links as the default"));
-    }
-
-    /**
-     * Get the WizardFrame.
-     *
-     * @return The current wizardDialog
-     */
-    public static synchronized InstallerDialog getWizardFrame() {
-        if (wizardDialog == null) {
-            new Main();
-        }
-        return wizardDialog;
-    }
-
-    /**
-     * Set the WizardFrame.
-     *
-     * @param dialog The new WizardDialog
-     */
-    private static void setWizardFrame(final InstallerDialog dialog) {
-        wizardDialog = dialog;
-    }
-
-    /**
-     * Run the installer.
-     *
-     * @param args Command line arguments
-     */
-    public static void main(final String[] args) {
-        setupCLIParser();
-        if (cli.wantsHelp(args)) {
-            cli.showHelp("DMDirc installer Help", "[options [--]]");
-            System.exit(0);
-        }
-        cli.parseArgs(args, false);
-        getWizardFrame().display();
-    }
-}

src/com/dmdirc/installer/Settings.java

@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-/**
- * Simple interface describing available settings for the installer.
- */
-public interface Settings {
-
-    /**
-     * Returns the state of the shortcutMenu checkbox.
-     *
-     * @return shortcutMenu checkbox state
-     */
-    boolean getShortcutMenuState();
-
-    /**
-     * Returns the state of the shortcutDesktop checkbox.
-     *
-     * @return shortcutDesktop checkbox state
-     */
-    boolean getShortcutDesktopState();
-
-    /**
-     * Returns the state of the shortcutDesktop checkbox.
-     *
-     * @return shortcutDesktop checkbox state
-     */
-    boolean getShortcutQuickState();
-
-    /**
-     * Returns the state of the shortcutProtocol checkbox.
-     *
-     * @return shortcutDesktop checkbox state
-     */
-    boolean getShortcutProtocolState();
-
-    /**
-     * Returns the location chosen for installation.
-     *
-     * @return location chosen for installation.
-     */
-    String getInstallLocation();
-}

src/com/dmdirc/installer/Step.java

@@ -1,53 +0,0 @@
-/*
- * 
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import java.awt.Image;
-
-/**
- * Simple step interface.
- */
-public interface Step {
-
-    /**
-     * Returns the name of this step.
-     * 
-     * @return Step name
-     */
-    String getStepName();
-    
-    /**
-     * Returns the description for this step.
-     * 
-     * @return Step description
-     */
-    String getStepDescription();
-    
-    /**
-     * Returns the icon for this step.
-     * 
-     * @return Step icon
-     */
-    Image getIcon();
-}

src/com/dmdirc/installer/StepListener.java

@@ -1,44 +0,0 @@
-/*
- * 
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-/**
- * Step listeners, listens for changes regarding steps.
- */
-public interface StepListener {
-
-    /**
-     * Called when a step is about to be displayed.
-     * 
-     * @param step Step to be displayed
-     */
-    void stepAboutToDisplay(final Step step);
-
-    /**
-     * Called when a step is hidden.
-     * 
-     * @param step
-     */
-    void stepHidden(final Step step);
-}

src/com/dmdirc/installer/StreamReader.java

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-/**
- * Simple stream reader to read a stream and add it to a text step
- */
-public class StreamReader extends Thread {
-
-    /** This is the Input Stream we are reading */
-    private final InputStream stream;
-    /** This is the output Prefix */
-    private String prefix = null;
-    /** This is the StringBuffer to store data in if wanted */
-    private StringBuffer data = null;
-    /** This is the Step we are outputting to, */
-    private TextStep step = null;
-
-    /**
-     * Create a new Stream Reader
-     *
-     * @param stream The stream to read
-     */
-    public StreamReader(final InputStream stream) {
-        this.stream = stream;
-    }
-
-    /**
-     * Create a new Stream Reader that saves what it reads
-     *
-     * @param stream The stream to read
-     * @param data The stringbuffer to store the output in
-     * @since 0.6
-     */
-    public StreamReader(final InputStream stream, final StringBuffer data) {
-        this.stream = stream;
-        this.data = data;
-    }
-
-    /**
-     * Create a new Stream Reader that outputs what it reads
-     *
-     * @param stream The stream to read
-     * @param prefix Prefix of outputed messages
-     * @param step Step to output to (null = console)
-     */
-    public StreamReader(final InputStream stream, final String prefix,
-                        final TextStep step) {
-        this.stream = stream;
-        this.prefix = prefix;
-        this.step = step;
-
-        if (step == null) {
-            System.out.printf("[%s] Started%n", prefix);
-        } else {
-            step.addText(String.format(" - -[%s] Started", prefix));
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void run() {
-        final BufferedReader reader = new BufferedReader(new InputStreamReader(
-                stream));
-        try {
-            String line;
-            while ((line = reader.readLine()) != null) {
-                if (data != null) {
-                    if (data.length() > 0) {
-                        data.append('\n');
-                    }
-                    data.append(line);
-                }
-                if (prefix != null) {
-                    if (step == null) {
-                        System.out.printf("[%s] %s%n", prefix, line);
-                    } else {
-                        step.addText(String.format(" - -[%s] %s", prefix, line));
-                    }
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        } finally {
-            try {
-                stream.close();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-}

src/com/dmdirc/installer/TextStep.java

@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-/**
- * Quick access methods for a step to have a controllable text field.
- */
-public interface TextStep {
-
-    /**
-     * Add text to the infolabel on this step
-     *
-     * @param text Text to add to infoLabel
-     */
-    void addText(final String text);
-
-    /**
-     * Sets the text in the infolabel on this step
-     *
-     * @param text Text to set the infoLabel to
-     */
-    void setText(final String text);
-
-}

src/com/dmdirc/installer/WindowsInstaller.java

@@ -1,337 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-import com.dmdirc.installer.cliparser.CLIParser;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-
-/**
- * Installs DMDirc on windows
- *
- * @author Shane Mc Cormack
- */
-public class WindowsInstaller extends Installer {
-
-    /** {@inheritDoc} */
-    @Override
-    public String defaultInstallLocation() {
-        String result = "";
-        if (CLIParser.getCLIParser().getParamNumber("-directory") > 0) {
-            result = CLIParser.getCLIParser().getParam("-directory")
-                    .getStringValue();
-        }
-        if (result.isEmpty()) {
-            String filename = System.getenv("PROGRAMFILES");
-            if (filename == null) {
-                if (isVista()) {
-                    filename = System.getProperty("user.home")
-                            + "\\Desktop\\DMDirc";
-                } else {
-                    filename = "C:\\Program Files";
-                }
-            }
-            result = filename + "\\DMDirc";
-        }
-        return result;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean validFile(final String filename) {
-        return !filename.equalsIgnoreCase("setup.exe")
-                && !filename.equalsIgnoreCase("jre.exe")
-                && !filename.equalsIgnoreCase("wget.exe")
-                && !filename.equalsIgnoreCase("wgetoutput")
-                && !filename.equalsIgnoreCase("shortcut.exe");
-    }
-
-    /**
-     * Are we running vista? -_-
-     *
-     * @return True if this is vista.
-     */
-    public boolean isVista() {
-        return System.getProperty("os.name").indexOf("Vista") >= 0;
-    }
-
-    /**
-     * Are we running NT?
-     *
-     * @return True if this is NT.
-     */
-    public boolean isNT() {
-        final String osName = System.getProperty("os.name");
-        return osName.indexOf("NT") >= 0 || osName.indexOf("2000") >= 0
-                || osName.indexOf("2003") >= 0 || osName.indexOf("XP") >= 0;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean supportsShortcut(final ShortcutType shortcutType) {
-        switch (shortcutType) {
-            case QUICKLAUNCH:
-                // Only windows 95 doesn't have quick launch
-                return !(System.getProperty("os.name").indexOf("95") >= 0);
-            case DESKTOP:
-            case MENU:
-            case UNINSTALLER:
-            case PROTOCOL:
-                // All versions of windows have desktop, menu, uninstaller and
-                // protocol
-                return true;
-            default:
-                // Anything else that gets added should be false until the
-                // relevent
-                // code is added
-                return false;
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getMenuName() {
-        return "Start menu";
-    }
-
-    /**
-     * Add a registry key.
-     *
-     * @param key
-     *            Key to add.
-     */
-    public void addRegistryKey(final String key) {
-        step.addText(" - Adding Key: " + key);
-        final String[] addKey = new String[] { "reg.exe", "add", key, "/f" };
-        execAndWait(addKey);
-    }
-
-    /**
-     * Modify a registry value.
-     *
-     * @param key
-     *            Key to use.
-     * @param value
-     *            Value to modify.
-     * @param data
-     *            Data for key.
-     */
-    public void editRegistryValue(final String key, final String value,
-            final String data) {
-        editRegistryValue(key, value, "REG_SZ", data);
-    }
-
-    /**
-     * Modify a registry value.
-     *
-     * @param key
-     *            Key to use.
-     * @param value
-     *            Value to modify.
-     * @param type
-     *            Type of data.
-     * @param data
-     *            Data for key.
-     */
-    public void editRegistryValue(final String key, final String value,
-            final String type, final String data) {
-        final ArrayList<String> params = new ArrayList<String>();
-        step.addText(" - Editing value: " + key + "\\" + value);
-        params.add("reg.exe");
-        params.add("add");
-        params.add(key);
-        params.add("/f");
-        if (value.isEmpty()) {
-            params.add("/ve");
-        } else {
-            params.add("/v");
-            params.add(value);
-        }
-        params.add("/t");
-        params.add(type);
-        if (!data.isEmpty()) {
-            params.add("/d");
-            params.add(data);
-        }
-
-        execAndWait(params.toArray(new String[params.size()]));
-    }
-
-    /**
-     * Execute and wait for the requested command
-     *
-     * @param cmd
-     *            Command array to execute/
-     * @return return value from command, or -1 if there was an error.
-     */
-    private int execAndWait(final String[] cmd) {
-        try {
-            final Process myProcess = Runtime.getRuntime().exec(cmd);
-            new StreamReader(myProcess.getInputStream()).start();
-            new StreamReader(myProcess.getErrorStream()).start();
-            try {
-                myProcess.waitFor();
-            } catch (final InterruptedException e) {
-                //Ignore, handled below
-            }
-            if (myProcess.exitValue() != 0) {
-                step.addText("\t - Error: Unknown Reason");
-            }
-            return myProcess.exitValue();
-        } catch (final SecurityException e) {
-            step.addText("\t - Error: " + e.getMessage());
-        } catch (final IOException e) {
-            step.addText("\t - Error: " + e.getMessage());
-        }
-
-        return -1;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setupShortcut(final String location,
-            final ShortcutType shortcutType) {
-        // Shortcut.exe is from http://www.optimumx.com/download/#Shortcut
-
-        if (!supportsShortcut(shortcutType)) {
-            step
-                    .addText(" - Error creating shortcut. Not applicable to this Operating System");
-            return;
-        }
-
-        if (new File("Shortcut.exe").exists()) {
-            String filename = "";
-            File dir;
-
-            switch (shortcutType) {
-                case DESKTOP:
-                    if (isNT() || isVista()) {
-                        filename = System.getProperty("user.home")
-                                + "\\Desktop";
-                    } else {
-                        filename = System.getenv("WINDIR") + "\\Desktop";
-                    }
-                    break;
-
-                case MENU:
-                    if (isVista()) {
-                        filename = System.getenv("APPDATA")
-                                + "\\Microsoft\\Windows";
-                    } else {
-                        filename = System.getProperty("user.home");
-                    }
-                    filename += "\\Start Menu\\Programs\\DMDirc";
-                    break;
-
-                case QUICKLAUNCH:
-                    if (isVista()) {
-                        filename = System.getProperty("user.home")
-                                + "\\AppData\\Roaming\\Microsoft\\Internet Explorer\\Quick Launch";
-                    } else {
-                        filename = System.getProperty("user.home")
-                                + "\\Application Data\\Microsoft\\Internet Explorer\\Quick Launch";
-                    }
-                    break;
-
-                case UNINSTALLER:
-                    // Registry hax!
-                    final String key = "HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\DMDirc";
-                    addRegistryKey(key);
-                    editRegistryValue(key, "Comments", "DMDirc IRC Client");
-                    editRegistryValue(key, "DisplayName", "DMDirc IRC Client");
-                    editRegistryValue(key, "DisplayIcon", location
-                            + "\\icon.ico");
-                    editRegistryValue(key, "UninstallString", location
-                            + "\\Uninstaller.exe");
-                    editRegistryValue(key, "Publisher", "DMDirc.com");
-                    editRegistryValue(key, "URLInfoAbout",
-                            "http://www.DMDirc.com/");
-                    editRegistryValue(key, "URLUpdateInfo",
-                            "http://www.DMDirc.com/");
-                    editRegistryValue(key, "InstallDir", location);
-                    editRegistryValue(key, "InstalledTime", String
-                            .valueOf(System.currentTimeMillis()));
-                    return;
-
-                case PROTOCOL:
-                    // Add needed keys.
-                    addRegistryKey("HKCR\\irc");
-                    addRegistryKey("HKCR\\irc\\DefaultIcon");
-                    addRegistryKey("HKCR\\irc\\Shell");
-                    addRegistryKey("HKCR\\irc\\Shell\\open");
-                    addRegistryKey("HKCR\\irc\\Shell\\open\\command");
-                    // Now the values
-                    editRegistryValue("HKCR\\irc", "", "URL:IRC Protocol");
-                    editRegistryValue("HKCR\\irc", "URL Protocol", "");
-                    editRegistryValue("HKCR\\irc", "EditFlags", "REG_BINARY",
-                            "02000000");
-                    editRegistryValue("HKCR\\irc\\DefaultIcon", "", location
-                            + "\\icon.ico");
-                    editRegistryValue("HKCR\\irc\\Shell\\open\\command", "",
-                            "\\\"" + location + "\\DMDirc.exe\\\" -e -c %1");
-                    return;
-
-                default:
-                    step
-                            .addText(" - Error creating shortcut. Not applicable to this Operating System");
-                    return;
-            }
-
-            if (filename.length() == 0) {
-                step
-                        .addText(" - Error creating shortcut. Not applicable to this System");
-                return;
-            }
-
-            // Check the dir exists
-            dir = new File(filename);
-            if (!dir.exists()) {
-                dir.mkdir();
-            }
-
-            // Delete an older shortcut
-            final File oldFile = new File(filename + "\\DMDirc.lnk");
-            if (oldFile.exists()) {
-                oldFile.delete();
-            }
-
-            // final String thisDirName = new File("").getAbsolutePath();
-            final String[] command = new String[] {
-                    // thisDirName+"/Shortcut.exe",
-                    "Shortcut.exe",
-                    "/F:" + filename + "\\DMDirc.lnk",
-                    "/A:C",
-                    // "/T:"+location+"\\DMDirc.bat",
-                    // "/T:javaw.exe",
-                    // "/P:-jar DMDirc.jar",
-                    "/T:" + location + "\\DMDirc.exe", "/W:" + location,
-                    "/I:" + location + "\\icon.ico", "/D:DMDirc IRC Client" };
-            execAndWait(command);
-        } else {
-            step
-                    .addText(" - Error creating shortcut: Unable to find Shortcut.exe");
-        }
-    }
-}

src/com/dmdirc/installer/WizardListener.java

@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer;
-
-/**
- * Wizard interface, notifications on change of step and closing.
- */
-public interface WizardListener {
-    
-    /** 
-     * Called when the wizard finishes. 
-     */
-    void wizardFinished();
-    
-    /**
-     * Called when the wizard is cancelled.
-     */
-    void wizardCancelled();
-}

src/com/dmdirc/installer/cliparser/BooleanParam.java

@@ -1,93 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Shane Mc Cormack
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.cliparser;
-
-/**
- * Command Line argument type.
- */
-public class BooleanParam extends CLIParam {
-    /** The value of this param. */
-    private boolean myValue = false;
-
-    /**
-     * Create a new BooleanParam.
-     * 
-     * @param chr
-     *            Single Character flag for this param.
-     * @param str
-     *            String flag for this param.
-     * @param desc
-     *            Description of this flag.
-     */
-    public BooleanParam(final char chr, final String str, final String desc) {
-        super(chr, str, desc);
-    }
-
-    /**
-     * Set the value of this param to the value given by a string.
-     * 
-     * @param value
-     *            String taken from command line to use as value.
-     * @return true if value was valid, else false.
-     */
-    @Override
-    public boolean setValue(final String value) {
-        // if no value, or an empty value is given, toggle the value
-        if (value == null || value.isEmpty()) {
-            myValue = !myValue;
-            return true;
-            // Check if value is a word that means "true"
-        } else if (value.equals("1") || value.equalsIgnoreCase("true")
-                || value.equalsIgnoreCase("yes")) {
-            myValue = true;
-            return true;
-            // Check if value is a word that means "false"
-        } else if (value.equals("0") || value.equalsIgnoreCase("false")
-                || value.equalsIgnoreCase("no")) {
-            myValue = false;
-            return true;
-            // The value is not a valid boolean value.
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the value of this param.
-     * 
-     * @return Value of this parameter
-     */
-    public boolean getValue() {
-        return myValue;
-    }
-
-    /**
-     * Return the value of this param as a string.
-     * 
-     * @return The value of this param as a string.
-     */
-    @Override
-    public String getStringValue() {
-        return String.valueOf(getValue());
-    }
-}

src/com/dmdirc/installer/cliparser/CLIParam.java

@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Shane Mc Cormack
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.cliparser;
-
-/**
- * Command Line argument type.
- */
-public abstract class CLIParam {
-
-    /** Single Character flag for this param. */
-    private final char charFlag;
-    /** String flag for this param. */
-    private final String stringFlag;
-    /** Description of this flag. */
-    private final String description;
-    /** Number of times this param has been given. */
-    private int number;
-
-    /**
-     * Create a new CLIParam.
-     *
-     * @param chr Single Character flag for this param.
-     * @param str String flag for this param.
-     * @param desc Description of this flag.
-     */
-    protected CLIParam(final char chr, final String str, final String desc) {
-        charFlag = chr;
-        stringFlag = str;
-        description = desc;
-    }
-
-    /**
-     * Get the single character flag for this param.
-     */
-    public final char getChr() { return charFlag; }
-
-    /**
-     * Get the string flag for this param.
-     */
-    public final String getString() { return stringFlag; }
-
-    /**
-     * Get the description for this param.
-     */
-    public final String getDescription() { return description; }
-
-    /**
-     * Get the number of times this value has been given.
-     */
-    public final int getNumber() { return number; }
-
-    /**
-     * Increment the number of times this value has been given.
-     */
-    public final void incNumber() { ++number; }
-
-    /**
-     * Set the value of this param to the value given by a string.
-     *
-     * @param value String taken from command line to use as value.
-     * @return true if value was valid, else false.
-     */
-    public abstract boolean setValue(final String value);
-
-    /**
-     * Return the value of this param as a string.
-     *
-     * @return The value of this param as a string.
-     */
-    public abstract String getStringValue();
-}

src/com/dmdirc/installer/cliparser/CLIParser.java

@@ -1,274 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Shane Mc Cormack
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.cliparser;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Command Line argument parser.
- */
-public class CLIParser {
-    /** Singleton instance of CLIParser. */
-    private static CLIParser me;
-
-    /** Singleton instance of CLIParser. */
-    CLIParam helpParam = null;
-
-    /**
-     * Known arguments.
-     * This hashtable stores the arguments with their flags as the key.
-     */
-    private final Map<String, CLIParam> params = new HashMap<String, CLIParam>();
-
-    /**
-     * Known arguments.
-     * This ArrayList stores every param type. (used for help)
-     */
-    private final List<CLIParam> paramList = new ArrayList<CLIParam>();
-
-    /**
-     * Redundant Strings.
-     * This ArrayList stores redundant strings found whilst parsing the params.
-     */
-    private final List<String> redundant = new ArrayList<String>();
-
-    /**
-     * Get a reference to the CLIParser.
-     *
-     * @return CLI parser instance
-     */
-    public static synchronized CLIParser getCLIParser() {
-        if (me == null) {
-            me = new CLIParser();
-        }
-        return me;
-    }
-
-    /** Private constructor for CLIParser to prevent non-singleton instance. */
-    private CLIParser() {
-    }
-
-    /** Clear known params from the hashtable. */
-    public void clear() {
-        params.clear();
-        paramList.clear();
-        redundant.clear();
-    }
-
-    /**
-     * Add a CLIParam to the cliparser.
-     *
-     * @param param
-     *            CLIParam sub-class to use as a parameter.
-     * @return true if added, false if already exists.
-     */
-    public boolean add(final CLIParam param) {
-        final boolean validChar = param.getChr() == 0
-                || !params.containsKey(String.valueOf(param.getChr()));
-        final boolean validString = param.getString().isEmpty()
-                || !params.containsKey("-" + param.getString());
-        if (validChar && validString) {
-            if (param.getChr() != 0) {
-                params.put(String.valueOf(param.getChr()), param);
-            }
-            if (!param.getString().isEmpty()) {
-                params.put("-" + param.getString(), param);
-            }
-            paramList.add(param);
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    /**
-     * Get the number of times a param was given.
-     * In the case of params with both a char and string value, this number is
-     * the total for both.
-     *
-     * @param flag
-     *            Flag to get count for
-     * @return number, or -1 if the param is invalud
-     */
-    public int getParamNumber(final String flag) {
-        if (params.containsKey(flag)) {
-            return params.get(flag).getNumber();
-        } else {
-            return -1;
-        }
-    }
-
-    /**
-     * Get a CLIParam object for a given flag.
-     *
-     * @param flag
-     *            Flag to get param for
-     * @return CLIParam object, or null if there is none.
-     */
-    public CLIParam getParam(final String flag) {
-        if (params.containsKey(flag)) {
-            return params.get(flag);
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Get the list of params.
-     *
-     * @return list of params.
-     */
-    public List<CLIParam> getParamList() {
-        return paramList;
-    }
-
-    /**
-     * Get the list of redundant strings.
-     *
-     * @return list of redundant strings.
-     */
-    public List<String> getRedundant() {
-        final List<String> result = new ArrayList<String>();
-        for (final String item : redundant) {
-            result.add(item);
-        }
-        return result;
-    }
-
-    /**
-     * Set the "help" command.
-     *
-     * @param param
-     *            Param to look for in wantsHelp.
-     */
-    public void setHelp(final CLIParam param) {
-        helpParam = param;
-    }
-
-    /**
-     * Check if the help parameter has been passed to the CLI.
-     *
-     * @param args Command line arguments to parse
-     *
-     * @return true iif help param is passed
-     */
-    public boolean wantsHelp(final String[] args) {
-        if (helpParam == null) {
-            return false;
-        }
-        for (final String arg : args) {
-            if (arg.length() > 1 && arg.charAt(0) == '-') {
-                final String name = arg.substring(1);
-                if (name.equals("-")) {
-                    return false;
-                } else {
-                    final CLIParam param = getParam(name);
-                    if (param == helpParam) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Show the help
-     */
-    public void showHelp(final String title, final String usage) {
-        System.out.println(title);
-        System.out.println("------------------");
-        System.out.println(usage);
-        System.out.println(" ");
-        for (final CLIParam param : getParamList()) {
-            if (param.getChr() == 0) {
-                System.out.print("   ");
-            } else {
-                System.out.print("-" + param.getChr() + " ");
-            }
-            if (param.getString().isEmpty()) {
-                System.out.print("\t\t");
-            } else {
-                System.out.print("--" + param.getString() + " ");
-            }
-            System.out.println("\t" + param.getDescription());
-        }
-    }
-
-    /**
-     * Given a string array of arguments, parse as CLI Params.
-     *
-     * @param args
-     *            Arguments to pass
-     * @param strict
-     *            if True, will terminate if a given param is invalid.
-     */
-    public void parseArgs(final String[] args, final boolean strict) {
-        CLIParam lastParam = null;
-        boolean allRedundant = false;
-        for (String arg : args) {
-            if (arg.length() > 1 && arg.charAt(0) == '-' && !allRedundant) {
-                if (lastParam != null) {
-                    lastParam.setValue("");
-                }
-                final String name = arg.substring(1);
-                if (name.equals("-")) {
-                    allRedundant = true;
-                } else {
-                    lastParam = getParam(name);
-                    if (lastParam == null) {
-                        System.out.println("Unknown Param: -" + name);
-                        if (helpParam != null) {
-                            String command = "";
-                            if (helpParam.getString().isEmpty()) {
-                                command = String.valueOf(helpParam.getChr());
-                            } else if (helpParam.getChr() != 0) {
-                                command = helpParam.getString();
-                            }
-                            if (!command.isEmpty()) {
-                                System.out.println("Use " + command
-                                        + " to get help.");
-                            }
-                        }
-                        if (strict) {
-                            System.exit(1);
-                        }
-                    } else {
-                        lastParam.incNumber();
-                    }
-                }
-            } else {
-                if (arg.charAt(0) == '\\' && arg.length() > 1) {
-                    arg = arg.substring(1);
-                }
-                if (lastParam == null || allRedundant
-                        || !lastParam.setValue(arg)) {
-                    redundant.add(arg);
-                }
-            }
-        }
-    }
-}

src/com/dmdirc/installer/cliparser/IntegerParam.java

@@ -1,81 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Shane Mc Cormack
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.cliparser;
-
-/**
- * Command Line argument type.
- */
-public class IntegerParam extends CLIParam {
-    /** The value of this param. */
-    private int myValue = 0;
-
-    /**
-     * Create a new IntegerParam.
-     *
-     * @param chr
-     *            Single Character flag for this param.
-     * @param str
-     *            String flag for this param.
-     * @param desc
-     *            Description of this flag.
-     */
-    public IntegerParam(final char chr, final String str, final String desc) {
-        super(chr, str, desc);
-    }
-
-    /**
-     * Set the value of this param to the value given by a string.
-     *
-     * @param value
-     *            String taken from command line to use as value.
-     * @return true if value was valid, else false.
-     */
-    @Override
-    public boolean setValue(final String value) {
-        try {
-            myValue = Integer.parseInt(value);
-            return true;
-        } catch (final NumberFormatException nfe) {
-            return false;
-        }
-    }
-
-    /**
-     * Get the value of this param.
-     *
-     * @return Value of this parameter
-     */
-    public int getValue() {
-        return myValue;
-    }
-
-    /**
-     * Return the value of this param as a string.
-     *
-     * @return The value of this param as a string.
-     */
-    @Override
-    public String getStringValue() {
-        return "" + getValue();
-    }
-}

src/com/dmdirc/installer/cliparser/StringParam.java

@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Shane Mc Cormack
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.cliparser;
-
-/**
- * Command Line argument type.
- */
-public class StringParam extends CLIParam {
-
-    /** The value of this param. */
-    private String myValue = "";
-
-    /**
-    * Create a new StringParam.
-    *
-    * @param chr Single Character flag for this param.
-    * @param str String flag for this param.
-    * @param desc Description of this flag.
-    */
-    public StringParam(final char chr, final String str, final String desc) {
-        super(chr, str, desc);
-    }
-
-    /**
-    * Set the value of this param to the value given by a string.
-    *
-    * @param value String taken from command line to use as value.
-    * @return true if value was valid, else false.
-    */
-    public boolean setValue(final String value) {
-        myValue = value;
-        return true;
-    }
-
-    /**
-    * Get the value of this param.
-    *
-    * @return Value of this parameter
-    */
-    public String getValue() {
-        return myValue;
-    }
-
-    /**
-    * Return the value of this param as a string.
-    *
-    * @return The value of this param as a string.
-    */
-    public String getStringValue() {
-        return getValue();
-    }
-}

src/com/dmdirc/installer/ui/EtchedLineBorder.java

@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import java.awt.Component;
-import java.awt.Graphics;
-
-import javax.swing.border.EtchedBorder;
-
-import static com.dmdirc.installer.ui.InstallerDialog.SMALL_GAP;
-
-/**
- * An etched line border.
- */
-class EtchedLineBorder extends EtchedBorder {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-    /** Border side. */
-    private final BorderSide side;
-
-    /** Border side. */
-    public enum BorderSide {
-
-        /** Creates a border at the top. */
-        TOP,
-        /** Creates a border at the bottom. */
-        BOTTOM,
-    };
-
-    /**
-     * Creates a new etched line border.
-     * 
-     * @param type Etch type
-     * @param side Border side
-     */
-    public EtchedLineBorder(final int type, final BorderSide side) {
-        super(type);
-
-        this.side = side;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void paintBorder(final Component c, final Graphics g, final int x,
-                            final int y, final int width, final int height) {
-        g.translate(x, y);
-
-        g.setColor(
-                etchType == LOWERED ? getShadowColor(c) : getHighlightColor(c));
-        switch (side) {
-            case TOP:
-                g.drawLine(-SMALL_GAP, -SMALL_GAP, width + SMALL_GAP, -SMALL_GAP);
-                break;
-            case BOTTOM:
-                g.drawLine(-SMALL_GAP, height + SMALL_GAP, width + SMALL_GAP, height + SMALL_GAP);
-                break;
-            default:
-                break;
-        }
-
-        g.setColor(
-                etchType == LOWERED ? getHighlightColor(c) : getShadowColor(c));
-        switch (side) {
-            case TOP:
-                g.drawLine(-SMALL_GAP, -SMALL_GAP - 1, width + SMALL_GAP, -SMALL_GAP - 1);
-                break;
-            case BOTTOM:
-                g.drawLine(-SMALL_GAP, height + SMALL_GAP - 1, width + SMALL_GAP, height + SMALL_GAP - 1);
-                break;
-            default:
-                break;
-        }
-
-        g.translate(-x, -y);
-    }
-}

src/com/dmdirc/installer/ui/InstallerDialog.java

@@ -1,371 +0,0 @@
-/*
- *
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.Step;
-import com.dmdirc.installer.StepListener;
-import com.dmdirc.installer.WizardListener;
-import com.dmdirc.ui.CoreUIUtils;
-import com.dmdirc.util.ListenerList;
-
-import java.awt.BorderLayout;
-import java.awt.Dimension;
-import java.awt.Toolkit;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.swing.BorderFactory;
-import javax.swing.JFrame;
-import javax.swing.JOptionPane;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-
-/**
- * Installer dialog, showing the steps required to install DMDirc.
- */
-public class InstallerDialog extends JFrame implements ActionListener {
-
-    private static final long serialVersionUID = -2001827768443747849L;
-    private final TitlePanel title;
-    private final WizardPanel wizard;
-    private final WizardControlPanel control;
-    private final ListenerList listeners;
-    /** Small UI Gap. */
-    public static final int SMALL_GAP = 5;
-
-    /**
-     * Instantiates a new installer dialog
-     *
-     * @param dialogTitle
-     */
-    public InstallerDialog(final String dialogTitle) {
-        super(dialogTitle);
-        title = new TitlePanel(null);
-        wizard = new WizardPanel(this);
-        control = new WizardControlPanel();
-        listeners = new ListenerList();
-
-        setLayout(new BorderLayout(SMALL_GAP, SMALL_GAP));
-
-
-        title.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP, SMALL_GAP,
-                SMALL_GAP), title.getBorder()));
-        wizard.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP, SMALL_GAP,
-                SMALL_GAP), wizard.getBorder()));
-        control.setBorder(BorderFactory.createCompoundBorder(
-                BorderFactory.createEmptyBorder(SMALL_GAP, SMALL_GAP, SMALL_GAP,
-                SMALL_GAP), control.getBorder()));
-
-        add(title, BorderLayout.NORTH);
-        add(wizard, BorderLayout.CENTER);
-        add(control, BorderLayout.SOUTH);
-
-        setIconImage(Toolkit.getDefaultToolkit().createImage(Thread.
-                currentThread().getContextClassLoader().getResource(
-                "com/dmdirc/res/icon.png")));
-        setPreferredSize(new Dimension(400, 350));
-        setMaximumSize(new Dimension(400, 350));
-
-        control.getPrevButton().addActionListener(this);
-        control.getNextButton().addActionListener(this);
-    }
-
-    /**
-     * Adds a step.
-     *
-     * @param step Step to add
-     */
-    public void addStep(final SwingStep step) {
-        wizard.addStep(step);
-    }
-
-    /**
-     * Displays the installer.
-     */
-    public void display() {
-        wizard.display();
-        title.setStep(wizard.getCurrentStep());
-        control.setTotal(wizard.getTotalSteps());
-        control.setProgress(wizard.getCurrentStepIndex());
-        addWindowListener(new WindowAdapter() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void windowClosing(final WindowEvent e) {
-                fireWizardCancelled();
-            }
-        });
-
-        pack();
-        setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
-        CoreUIUtils.centreWindow(this);
-        setVisible(true);
-        fireStepAboutToBeDisplayed(wizard.getStep(wizard.getCurrentStepIndex()));
-    }
-
-    /**
-     * Displays the installer with these steps added.
-     *
-     * @param steps Steps to add
-     */
-    public void display(final List<Step> steps) {
-        final List<SwingStep> swingSteps = new ArrayList<SwingStep>();
-        for (Step step : steps) {
-            if (step instanceof SwingStep) {
-                swingSteps.add((SwingStep) step);
-            }
-        }
-        display();
-    }
-
-    /**
-     * Enables the next step.
-     *
-     * @param enable true to enable false to disable
-     */
-    public void enableNextStep(final boolean enable) {
-        control.getNextButton().setEnabled(enable);
-    }
-
-    /**
-     * Enables the previous step.
-     *
-     * @param enable true to enable false to disable
-     */
-    public void enablePreviousStep(final boolean enable) {
-        control.getPrevButton().setEnabled(enable);
-    }
-
-    /**
-     * shows the cancel confirmation.
-     *
-     * @return true if confirmed
-     */
-    public boolean showCancelConfirmation() {
-        return JOptionPane.showConfirmDialog(this,
-                                             "Are you sure you want to cancel?",
-                                             "Cancel confirmation",
-                                             JOptionPane.YES_NO_OPTION,
-                                             JOptionPane.WARNING_MESSAGE) ==
-               JOptionPane.YES_OPTION;
-    }
-
-    /**
-     * Gets the specified step for the installer.
-     *
-     * @param step Index of the step
-     *
-     * @return Requested step
-     */
-    public Step getStep(final int step) {
-        return wizard.getStep(step);
-    }
-
-    /**
-     * Gets the specified step for the installer.
-     *
-     * @param name Name of the step
-     *
-     * @return Requested step
-     */
-    public Step getStep(final String name) {
-        return wizard.getStep(name);
-    }
-
-    /**
-     * Returns the current step.
-     *
-     * @return Current step
-     */
-    public Step getCurrentStep() {
-        return wizard.getCurrentStep();
-    }
-
-    /**
-     * Returns the index of the current step.
-     *
-     * @return Current step's index
-     */
-    public int getCurrentStepIndex() {
-        return wizard.getCurrentStepIndex();
-    }
-
-    /**
-     * Returns the name of the current step.
-     *
-     * @return Current step's name
-     */
-    public String getCurrentStepName() {
-        return wizard.getCurrentStepName();
-    }
-
-    /**
-     * Informs listeners a step is about to be displayed.
-     *
-     * @param step Step to be displayed
-     */
-    void fireStepAboutToBeDisplayed(final Step step) {
-        for (StepListener listener : listeners.get(StepListener.class)) {
-            listener.stepAboutToDisplay(step);
-        }
-    }
-
-    /**
-     * Informs listeners a step is about to be hidden.
-     *
-     * @param step Step to be hidden
-     */
-    void fireStepHidden(final Step step) {
-        for (StepListener listener : listeners.get(StepListener.class)) {
-            listener.stepHidden(step);
-        }
-    }
-
-    /**
-     * Adds a step listener to this installer.
-     *
-     * @param listener Listener to add
-     */
-    public void addStepListener(final StepListener listener) {
-        listeners.add(StepListener.class, listener);
-    }
-
-    /**
-     * Removes a step listener from this installer.
-     *
-     * @param listener Listener to remove
-     */
-    public void removeStepListener(final StepListener listener) {
-        listeners.remove(StepListener.class, listener);
-
-    }
-
-    /**
-     * Informs listeners this installer has been cancelled.
-     */
-    void fireWizardCancelled() {
-        for (WizardListener listener : listeners.get(WizardListener.class)) {
-            listener.wizardCancelled();
-        }
-    }
-
-    /**
-     * Informs listeners this installer has been completed.
-     */
-    void fireWizardFinished() {
-        for (WizardListener listener : listeners.get(WizardListener.class)) {
-            listener.wizardFinished();
-        }
-    }
-
-    /**
-     * Adds a wizard listeners to this installer.
-     *
-     * @param listener Listener to add
-     */
-    public void addWizardListener(final WizardListener listener) {
-        listeners.add(WizardListener.class, listener);
-    }
-
-    /**
-     * Removes  a wizard listener from this installer
-     *
-     * @param listener Listener to remove
-     */
-    public void removeWizardListener(final WizardListener listener) {
-        listeners.remove(WizardListener.class, listener);
-    }
-
-    /**
-     * Initialises any settings required by this UI (this is always called
-     * before any aspect of the UI is instansiated).
-     *
-     * @throws UnsupportedOperationException If unable to switch to the system
-     * look and feel
-     */
-    public static void initUISettings() {
-
-        try {
-            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-        } catch (InstantiationException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                                                    "system look and feel", ex);
-        } catch (ClassNotFoundException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                                                    "system look and feel", ex);
-        } catch (UnsupportedLookAndFeelException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                                                    "system look and feel", ex);
-        } catch (IllegalAccessException ex) {
-            throw new UnsupportedOperationException("Unable to switch to the " +
-                                                    "system look and feel", ex);
-        }
-
-        UIManager.put("swing.useSystemFontSettings", true);
-        UIManager.put("swing.boldMetal", false);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param e Action performed
-     */
-    @Override
-    public void actionPerformed(final ActionEvent e) {
-        final int currentStep = wizard.getCurrentStepIndex();
-        Step hiddenStep = null;
-        Step shownStep = null;
-        if (e.getSource() == control.getPrevButton()) {
-            wizard.previousStep();
-            hiddenStep = wizard.getStep(currentStep);
-            shownStep = wizard.getStep(currentStep - 1);
-        } else if (e.getSource() == control.getNextButton()) {
-            if ("Finish".equals(control.getNextButton().getText())) {
-                fireWizardFinished();
-                shownStep = wizard.getStep(currentStep);
-                dispose();
-            } else {
-                wizard.nextStep();
-                hiddenStep = wizard.getStep(currentStep);
-                shownStep = wizard.getStep(currentStep + 1);
-            }
-        } else {
-            return;
-        }
-        title.setStep(shownStep);
-        if (shownStep != null) {
-            fireStepAboutToBeDisplayed(shownStep);
-        }
-        if (hiddenStep != null) {
-            fireStepHidden(hiddenStep);
-        }
-        control.setProgress(wizard.getCurrentStepIndex());
-    }
-}

src/com/dmdirc/installer/ui/StepConfirm.java

@@ -1,95 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.TextStep;
-
-import java.awt.BorderLayout;
-import java.awt.Image;
-import javax.swing.SwingUtilities;
-
-/**
- * This confirms the settings chosen in the previous step
- */
-public final class StepConfirm extends SwingStep implements TextStep {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 2;
-    /** Text area showing the install information */
-    private final TextLabel infoLabel = new TextLabel("");
-
-    /**
-     * Creates a new instance of StepConfirm.
-     */
-    public StepConfirm() {
-        super();
-        setLayout(new BorderLayout());
-        add(infoLabel, BorderLayout.CENTER);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepName() {
-        return "Confirm";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Image getIcon() {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepDescription() {
-        return "";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addText(final String text) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                infoLabel.setText(infoLabel.getText() + text);
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setText(final String text) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                infoLabel.setText(text);
-            }
-        });
-    }
-}

src/com/dmdirc/installer/ui/StepError.java

@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import java.awt.BorderLayout;
-import java.awt.Image;
-
-/**
- * This step shows an unable to install error
- */
-public final class StepError extends SwingStep {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 2;
-
-    /**
-     * Creates a new instance of StepError with a default error message.
-     */
-    public StepError() {
-        this("Sorry, it is not possible to install DMDirc on this system at this time.\n\n");
-    }
-
-    /**
-     * Creates a new instance of StepError with a given error message.
-     *
-     * @param message Error message to show.
-     */
-    public StepError(final String message) {
-        super();
-        setLayout(new BorderLayout());
-        add(new TextLabel(message), BorderLayout.CENTER);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepName() {
-        return "Error";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Image getIcon() {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepDescription() {
-        return "";
-    }
-}

src/com/dmdirc/installer/ui/StepInstall.java

@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.TextStep;
-
-import java.awt.BorderLayout;
-import java.awt.Image;
-
-import java.awt.Insets;
-import javax.swing.JScrollPane;
-import javax.swing.SwingUtilities;
-
-/**
- * This confirms the settings chosen in the previous step
- */
-public final class StepInstall extends SwingStep implements TextStep {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 2;
-    /** Text area showing the install information */
-    private final TextLabel infoLabel = new TextLabel("Beginning Install");
-    /** Scroll pane holding text area */
-    final JScrollPane scrollPane;
-
-    /**
-     * Creates a new instance of StepInstall.
-     */
-    public StepInstall() {
-        super();
-        setLayout(new BorderLayout());
-        scrollPane = new JScrollPane(infoLabel,
-                                     JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
-                                     JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
-        infoLabel.setMargin(new Insets(5, 5, 5, 5));
-        add(scrollPane, BorderLayout.CENTER);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepName() {
-        return "Install";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Image getIcon() {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepDescription() {
-        return "";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public synchronized void addText(final String text) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                infoLabel.setText(infoLabel.getText() + text + "\n");
-            }
-        });
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public synchronized void setText(final String text) {
-        SwingUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                infoLabel.setText(text);
-            }
-        });
-    }
-}

src/com/dmdirc/installer/ui/StepLayout.java

@@ -1,417 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.Step;
-
-import java.awt.Component;
-import java.awt.Container;
-import java.awt.Dimension;
-import java.awt.Insets;
-import java.awt.LayoutManager2;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Adjusted Card layout.
- */
-public class StepLayout implements LayoutManager2, Serializable {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 2;
-    /** Cards vector. */
-    private final List<SwingStep> steps;
-    /** Current step. */
-    private int currentStep;
-    /** Vertical gap. */
-    private int vGap;
-    /** Horiontal gap. */
-    private int hGap;
-
-    /**
-     * Instantiates a new step layout.
-     */
-    public StepLayout() {
-        this(0, 0);
-    }
-
-    /**
-     * Instantiates a new step layout.
-     *
-     * @param parent Parent component
-     */
-    public StepLayout(final Container parent) {
-        this(0, 0, parent);
-    }
-
-    /**
-     * Instantiates a new step layout with the specified gaps.
-     *
-     * @param hGap Horizontal gap
-     * @param vGap Vertical gap
-     */
-    public StepLayout(final int hGap, final int vGap) {
-        this(hGap, vGap, null);
-    }
-
-    /**
-     * Instantiates a new step layout with the specified gaps.
-     *
-     * @param hGap Horizontal gap
-     * @param vGap Vertical gap
-     * @param parent Parent component
-     */
-    public StepLayout(final int hGap, final int vGap, final Container parent) {
-        steps = new ArrayList<SwingStep>();
-        currentStep = -1;
-        this.hGap = hGap;
-        this.vGap = vGap;
-    }
-
-    /**
-     * Returns the number of steps in the layout.
-     *
-     * @return number of steps >= 0
-     */
-    public int size() {
-        return steps.size();
-    }
-
-    /**
-     * Checks if the layout is empty
-     *
-     * @return true iif the layout has no steps
-     */
-    public boolean isEmpty() {
-        return steps.isEmpty();
-    }
-
-    /**
-     * Returns the specified step from the layout.
-     *
-     * @param index Step to retrieve
-     *
-     * @return Step
-     */
-    public Step getStep(final int index) {
-        return steps.get(index);
-    }
-
-    /**
-     * Returns the step list.
-     *
-     * @return List of steps
-     */
-    public List<SwingStep> getSteps() {
-        return steps;
-    }
-
-    /**
-     * Returns the current step index.
-     *
-     * @return Current step index
-     */
-    public int getCurrentStepIndex() {
-        return currentStep;
-    }
-
-    /**
-     * Returns the current step name.
-     *
-     * @return Current step name
-     */
-    public String getCurrentStepName() {
-        return steps.get(currentStep).getStepName();
-    }
-
-    /**
-     * Returns the current step name.
-     *
-     * @return Current step name
-     */
-    public Step getCurrentStep() {
-        return steps.get(currentStep);
-    }
-
-    /**
-     * Show the first step.
-     *
-     * @param parent Parent container
-     */
-    public void first(final Container parent) {
-        show(0, parent);
-    }
-
-    /**
-     * Show the last step.
-     *
-     * @param parent Parent container
-     */
-    public void last(final Container parent) {
-        show(parent.getComponentCount() - 1, parent);
-    }
-
-    /**
-     * Show the next step.
-     *
-     * @param parent Parent container
-     */
-    public void next(final Container parent) {
-        show(currentStep + 1, parent);
-    }
-
-    /**
-     * Show the previous step.
-     *
-     * @param parent Parent container
-     */
-    public void previous(final Container parent) {
-        show(currentStep - 1, parent);
-    }
-
-    /**
-     * Show the specified step.
-     *
-     * @param step Step to show
-     * @param parent Parent container
-     */
-    public void show(final Step step, final Container parent) {
-        show(steps.indexOf(step), parent);
-    }
-
-    /**
-     * Show the step at the specified index.
-     *
-     * @param step Step to show
-     * @param parent Parent container
-     */
-    public void show(final int step, final Container parent) {
-        int stepNumber = step;
-        if (stepNumber == -1) {
-            if (stepNumber >= steps.size()) {
-                stepNumber = steps.size() - 1;
-            } else {
-                stepNumber = 0;
-            }
-        }
-        synchronized (parent.getTreeLock()) {
-            final int componentCount = parent.getComponentCount();
-            for (int i = 0; i < componentCount; i++) {
-                final Component comp = parent.getComponent(i);
-                if (comp.isVisible()) {
-                    comp.setVisible(false);
-                    break;
-                }
-            }
-            if (componentCount > 0) {
-                currentStep = stepNumber;
-                parent.getComponent(currentStep).setVisible(true);
-                parent.validate();
-            }
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void addLayoutComponent(final Component comp,
-                                   final Object constraints) {
-        if (!(comp instanceof Step)) {
-            throw new IllegalArgumentException(
-                    "Component must be an instance of Step");
-        }
-        addLayoutComponent((SwingStep) comp);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @deprecated Use addLayoutComponent(Component, Object) or
-     * addLayoutComponent(Component)
-     *
-     * @see addLayoutComponent(Component)
-     * @see addLayoutComponent(Component, Object)
-     */
-    @Override
-    @Deprecated
-    public void addLayoutComponent(final String name, final Component comp) {
-        if (!(comp instanceof Step)) {
-            throw new IllegalArgumentException(
-                    "Component must be an instance of Step");
-        }
-        addLayoutComponent((SwingStep) comp);
-    }
-
-    /**
-     * Adds a component to the layout.
-     *
-     * @param step Component to add
-     */
-    public void addLayoutComponent(final SwingStep step) {
-        synchronized (step.getTreeLock()) {
-            if (!steps.isEmpty()) {
-                step.setVisible(false);
-            }
-            steps.add(step);
-        }
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void removeLayoutComponent(final Component comp) {
-        synchronized (comp.getTreeLock()) {
-            if (comp.isVisible()) {
-                comp.setVisible(false);
-            }
-            next(comp.getParent());
-            steps.remove(comp);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return Returns the preferred size of the container
-     */
-    @Override
-    public Dimension preferredLayoutSize(final Container parent) {
-        synchronized (parent.getTreeLock()) {
-            final Insets insets = parent.getInsets();
-            final int componentCount = parent.getComponentCount();
-            int width = 0;
-            int height = 0;
-
-            for (int i = 0; i < componentCount; i++) {
-                final Component comp = parent.getComponent(i);
-                final Dimension preferredDimension = comp.getPreferredSize();
-
-                width = Math.max(width, preferredDimension.width);
-                height = Math.max(height, preferredDimension.height);
-            }
-            return new Dimension(insets.left + insets.right + width + hGap * 2,
-                                 insets.top + insets.bottom + height + vGap * 2);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @return Returns the minimum size of the container
-     */
-    @Override
-    public Dimension minimumLayoutSize(final Container parent) {
-        synchronized (parent.getTreeLock()) {
-            final Insets insets = parent.getInsets();
-            final int componentCount = parent.getComponentCount();
-            int width = 0;
-            int height = 0;
-
-            for (int i = 0; i < componentCount; i++) {
-                final Component comp = parent.getComponent(i);
-                final Dimension minimumDimension = comp.getMinimumSize();
-
-                width = Math.max(width, minimumDimension.width);
-                height = Math.max(height, minimumDimension.height);
-            }
-            return new Dimension(insets.left + insets.right + width + hGap * 2,
-                                 insets.top + insets.bottom + height + vGap * 2);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param parent Container to get the size for
-     *
-     * @return Returns the maximum size of the container
-     */
-    @Override
-    public Dimension maximumLayoutSize(final Container parent) {
-        return new Dimension(Integer.MAX_VALUE, Integer.MAX_VALUE);
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param target Container to get the alignment from
-     *
-     * @return Alignment
-     */
-    @Override
-    public float getLayoutAlignmentX(final Container target) {
-        return 0.5f;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param target Container to get the alignment from
-     *
-     * @return Alignment
-     */
-    @Override
-    public float getLayoutAlignmentY(final Container target) {
-        return 0.5f;
-    }
-
-    /**
-     * {@inheritDoc}
-     *
-     * @param target  Container to invalidate
-     */
-    @Override
-    public void invalidateLayout(final Container target) {
-        //Ignore
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void layoutContainer(final Container parent) {
-        synchronized (parent.getTreeLock()) {
-            final Insets insets = parent.getInsets();
-            final int componentCount = parent.getComponentCount();
-            Component comp = null;
-            boolean currentFound = false;
-
-            for (int i = 0; i < componentCount; i++) {
-                comp = parent.getComponent(i);
-                comp.setBounds(hGap + insets.left, vGap + insets.top,
-                               parent.getWidth() - (hGap * 2 + insets.left +
-                                                    insets.right), parent.
-                        getHeight() - (vGap * 2 +
-                                       insets.top + insets.bottom));
-                if (comp.isVisible()) {
-                    currentFound = true;
-                }
-            }
-
-            if (!currentFound && componentCount > 0) {
-                parent.getComponent(0).setVisible(true);
-            }
-        }
-    }
-}

src/com/dmdirc/installer/ui/StepSettings.java

@@ -1,168 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.DefaultSettings;
-import com.dmdirc.installer.Main;
-import com.dmdirc.installer.Settings;
-import com.dmdirc.installer.Installer.ShortcutType;
-
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Image;
-import java.awt.Insets;
-
-import javax.swing.Box;
-import javax.swing.JCheckBox;
-import javax.swing.JTextField;
-
-/**
- * Queries the user for where to install dmdirc, and if they want to setup shortcuts
- */
-public final class StepSettings extends SwingStep implements Settings {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 3;
-    /** Menu Shorcuts checkbox. */
-    private final JCheckBox shortcutMenu = new JCheckBox("Create " + Main.
-            getInstaller().getMenuName() + " shortcut");
-    /** Desktop Shorcuts checkbox. */
-    private final JCheckBox shortcutDesktop = new JCheckBox(
-            "Create desktop shortcut");
-    /** Quick-Launch Shorcuts checkbox. */
-    private final JCheckBox shortcutQuick = new JCheckBox(
-            "Create Quick Launch shortcut");
-    /** Register IRC:// protocol. */
-    private final JCheckBox shortcutProtocol = new JCheckBox(
-            "Make DMDirc handle irc:// links");
-    /** Install Location input. */
-    private final JTextField location = new JTextField(Main.getInstaller().
-            defaultInstallLocation(), 20);
-
-    /**
-     * Creates a new instance of StepSettings.
-     */
-    public StepSettings() {
-        super();
-
-        final DefaultSettings defaultSettings = new DefaultSettings();
-        shortcutMenu.setSelected(defaultSettings.getShortcutMenuState());
-        shortcutDesktop.setSelected(defaultSettings.getShortcutDesktopState());
-        shortcutQuick.setSelected(defaultSettings.getShortcutQuickState());
-        shortcutProtocol.setSelected(defaultSettings.getShortcutProtocolState());
-
-        final GridBagConstraints constraints = new GridBagConstraints();
-        setLayout(new GridBagLayout());
-
-        constraints.weightx = 1.0;
-        constraints.fill = GridBagConstraints.BOTH;
-        constraints.gridx = 0;
-        constraints.gridy = 0;
-        constraints.gridwidth = 2;
-        add(new TextLabel("Here you can choose options for the install."
-                + "\n\nInstall Location:"), constraints);
-
-        constraints.fill = GridBagConstraints.HORIZONTAL;
-        constraints.gridx = 1;
-        constraints.gridy = 1;
-        add(location, constraints);
-
-        constraints.gridwidth = 2;
-        constraints.gridx = 0;
-        constraints.insets = new Insets(InstallerDialog.SMALL_GAP, 0, 0, 0);
-
-        if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
-            constraints.gridy = (constraints.gridy + 1);
-            add(shortcutMenu, constraints);
-        }
-        if (Main.getInstaller().supportsShortcut(ShortcutType.DESKTOP)) {
-            constraints.gridy = (constraints.gridy + 1);
-            add(shortcutDesktop, constraints);
-        }
-        if (Main.getInstaller().supportsShortcut(ShortcutType.QUICKLAUNCH)) {
-            constraints.gridy = (constraints.gridy + 1);
-            add(shortcutQuick, constraints);
-        }
-        if (Main.getInstaller().supportsShortcut(ShortcutType.PROTOCOL)) {
-            constraints.gridy = (constraints.gridy + 1);
-            add(shortcutProtocol, constraints);
-        }
-
-        constraints.gridy = (constraints.gridy + 1);
-        constraints.weighty = 1.0;
-        constraints.fill = GridBagConstraints.BOTH;
-        add(Box.createVerticalGlue(), constraints);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepName() {
-        return "Settings";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Image getIcon() {
-        return null;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepDescription() {
-        return "";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutMenuState() {
-        return shortcutMenu.isSelected();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutDesktopState() {
-        return shortcutDesktop.isSelected();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutQuickState() {
-        return shortcutQuick.isSelected();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public boolean getShortcutProtocolState() {
-        return shortcutProtocol.isSelected();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getInstallLocation() {
-        return location.getText().trim();
-    }
-}

src/com/dmdirc/installer/ui/StepWelcome.java

@@ -1,77 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-package com.dmdirc.installer.ui;
-
-import java.awt.BorderLayout;
-import java.awt.Image;
-import java.awt.Toolkit;
-
-/**
- * Tells the user what this application does
- */
-public final class StepWelcome extends SwingStep {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 2;
-
-    /**
-     * Creates a new instance of StepWelcome.
-     *
-     * @param releaseName 
-     */
-    public StepWelcome(final String releaseName) {
-        super();
-
-        setLayout(new BorderLayout());
-
-        add(new TextLabel(
-                "Welcome to the " + releaseName + " installer. This program "
-                + "will install DMDirc on this computer.\n\nDMDirc is a "
-                + "cross-platform IRC client developed by Chris Smith, Shane "
-                + "Mc Cormack and Gregory Holmes. DMDirc is released for free "
-                + "under the MIT licence; for more information, please visit "
-                + "www.DMDirc.com.\n\nClick \"Next\" to continue, or close "
-                + "this program to cancel the installation."), BorderLayout.CENTER);
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepName() {
-        return "Welcome";
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public Image getIcon() {
-        return Toolkit.getDefaultToolkit().createImage(ClassLoader.getSystemResource("com/dmdirc/res/icon.png"));
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public String getStepDescription() {
-        return "";
-    }
-}

src/com/dmdirc/installer/ui/SwingStep.java

@@ -1,34 +0,0 @@
-/*
- * 
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- * 
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- * 
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- * 
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.Step;
-
-import javax.swing.JPanel;
-
-/**
- * Extention of basic Step to make it a JPanel.
- */
-public abstract class SwingStep extends JPanel implements Step {
-}

src/com/dmdirc/installer/ui/TextLabel.java

@@ -1,74 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import java.awt.Insets;
-
-import javax.swing.JTextPane;
-import javax.swing.text.DefaultStyledDocument;
-
-/**
- * Dyamnic text label.
- */
-public class TextLabel extends JTextPane {
-
-    /**
-     * A version number for this class. It should be changed whenever the
-     * class structure is changed (or anything else that would prevent
-     * serialized objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
-    /**
-     * Creates a new instance of TextLabel.
-     */
-    public TextLabel() {
-        this(null, true);
-    }
-
-    /**
-     * Creates a new instance of TextLabel.
-     *
-     * @param text Text to display
-     */
-    public TextLabel(final String text) {
-        this(text, true);
-    }
-
-    /**
-     * Creates a new instance of TextLabel.
-     *
-     * @param text Text to display
-     * @param justified Justify the text?
-     */
-    public TextLabel(final String text, final boolean justified) {
-        super(new DefaultStyledDocument());
-
-        setOpaque(false);
-        setEditable(false);
-        setHighlighter(null);
-        setMargin(new Insets(0, 0, 0, 0));
-
-        setText(text);
-    }
-}

src/com/dmdirc/installer/ui/TitlePanel.java

@@ -1,91 +0,0 @@
-/*
- *
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.Step;
-import com.dmdirc.installer.ui.EtchedLineBorder.BorderSide;
-
-import java.awt.BorderLayout;
-import java.awt.Color;
-
-import javax.swing.ImageIcon;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.border.EtchedBorder;
-
-/**
- * Simple title panel for a wizard.
- */
-public class TitlePanel extends JPanel {
-
-    private static final long serialVersionUID = 7173184984913948951L;
-    private final JLabel title;
-    private final JLabel image;
-
-    /**
-     * Instantiates a new title panel.
-     *
-     * @param step Initial title text
-     */
-    public TitlePanel(final Step step) {
-        super(new BorderLayout());
-
-        title = new JLabel();
-        image = new JLabel();
-
-        setStep(step);
-
-        title.setFont(title.getFont().deriveFont((float) (title.getFont().
-                getSize() * 1.5)));
-        title.setForeground(Color.BLACK);
-        add(title, BorderLayout.CENTER);
-        add(image, BorderLayout.EAST);
-        setBackground(Color.WHITE);
-        setBorder(new EtchedLineBorder(EtchedBorder.RAISED, BorderSide.BOTTOM));
-    }
-
-    /**
-     * Sets the title text.
-     *
-     * @param step new title text
-     */
-    public void setStep(final Step step) {
-        if (step == null) {
-            title.setText("");
-            image.setIcon(null);
-            return;
-        }
-
-        if ("".equals(step.getStepDescription())) {
-            title.setText(step.getStepName());
-        } else {
-            title.setText(step.getStepName() + "\n" + step.getStepDescription());
-        }
-        if (step.getIcon() == null) {
-            image.setIcon(null);
-        } else {
-            image.setIcon(new ImageIcon(step.getIcon()));
-        }
-    }
-}

src/com/dmdirc/installer/ui/WizardControlPanel.java

@@ -1,143 +0,0 @@
-/*
- *
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.ui.EtchedLineBorder.BorderSide;
-import java.awt.Dimension;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.border.EtchedBorder;
-
-/**
- * Simple Panel representing the control buttons for a wizard.
- */
-public class WizardControlPanel extends JPanel {
-
-    private static final long serialVersionUID = 7903362315297158222L;
-    private final JButton prev;
-    private final JButton next;
-    private final JLabel progress;
-    private int total;
-    private int step;
-
-    /**
-     * Instantiates a new wizard control panel.
-     */
-    public WizardControlPanel() {
-        this(0);
-    }
-
-    /**
-     * Instantiates a new wizard control panel using the specified number of
-     * steps.
-     *
-     * @param total Total number of steps
-     */
-    public WizardControlPanel(final int total) {
-        this.total = total;
-        this.step = 0;
-
-        prev = new JButton("\u00AB Previous");
-        next = new JButton("Next \u00BB");
-        progress = new JLabel();
-        updateProgressLabel();
-
-        prev.setPreferredSize(new Dimension(100, prev.getFont().getSize() + 2 * InstallerDialog.SMALL_GAP));
-        next.setPreferredSize(new Dimension(100, next.getFont().getSize() + 2 * InstallerDialog.SMALL_GAP));
-
-        setBorder(new EtchedLineBorder(EtchedBorder.LOWERED, BorderSide.TOP));
-        setLayout(new BoxLayout(this, BoxLayout.LINE_AXIS));
-        add(progress);
-        add(Box.createHorizontalGlue());
-        add(prev);
-        add(Box.createHorizontalStrut(InstallerDialog.SMALL_GAP));
-        add(next);
-    }
-
-    /**
-     * Returns the previous button.
-     *
-     * @return Previous button
-     */
-    public JButton getPrevButton() {
-        return prev;
-    }
-
-    /**
-     * Returns the next button.
-     *
-     * @return Next button
-     */
-    public JButton getNextButton() {
-        return next;
-    }
-
-    /**
-     * Returns the progress label.
-     *
-     * @return Progress Label
-     */
-    public JLabel getProgressLabel() {
-        return progress;
-    }
-
-    /**
-     * Updates the progress label.
-     */
-    public void updateProgressLabel() {
-        progress.setText("Step " + step + " of " + total);
-    }
-
-    /**
-     * Sets the new total number of steps.
-     *
-     * @param total New total number of steps
-     */
-    public void setTotal(final int total) {
-        this.total = total;
-        updateProgressLabel();
-    }
-
-    /**
-     * Sets the current progress step.
-     *
-     * @param step Progress step
-     */
-    public void setProgress(final int step) {
-        this.step = step + 1;
-        updateProgressLabel();
-        if (step + 1 == total) {
-            next.setText("Finish");
-        } else if (step == 0) {
-            prev.setEnabled(false);
-        } else if (step > 0) {
-            prev.setEnabled(true);
-        } else {
-            next.setText("Next \u00BB");
-        }
-    }
-}

src/com/dmdirc/installer/ui/WizardPanel.java

@@ -1,181 +0,0 @@
-/*
- *
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.installer.ui;
-
-import com.dmdirc.installer.Step;
-
-import java.util.List;
-import javax.swing.JPanel;
-
-/**
- * Wizard panel, displays and controls the flow of steps.
- */
-public class WizardPanel extends JPanel {
-
-    private static final long serialVersionUID = 7903362315297158222L;
-    private final StepLayout layout;
-    private final InstallerDialog dialog;
-
-    /**
-     * Instantiates a new wizard panel.
-     *
-     * @param dialog Parent installer dialog
-     */
-    public WizardPanel(final InstallerDialog dialog) {
-        super();
-
-        this.dialog = dialog;
-        layout = new StepLayout();
-        setLayout(layout);
-    }
-
-    /**
-     * Displays this panel with the specified steps.
-     *
-     * @param steps Steps to display
-     */
-    public void display(final List<SwingStep> steps) {
-       for (SwingStep step : steps) {
-           addStep(step);
-       }
-       display();
-    }
-
-    /**
-     * Displays this panel with the existing steps.
-     */
-    public void display() {
-        showFirst();
-    }
-
-    /**
-     * Returns the step specified.
-     *
-     * @param step Step index
-     *
-     * @return Step
-     */
-    public Step getStep(final int step) {
-        return layout.getStep(step);
-    }
-
-    /**
-     * Returns the step specified.
-     *
-     * @param stepName Step name
-     *
-     * @return Step
-     */
-    public Step getStep(final String stepName) {
-        for (SwingStep loopStep : layout.getSteps()) {
-            if (stepName.equals(loopStep.getStepName())) {
-                return loopStep;
-            }
-        }
-
-        return null;
-    }
-
-    /**
-     * Returns the current Step.
-     *
-     * @return Current step index
-     */
-    public int getCurrentStepIndex() {
-        return layout.getCurrentStepIndex();
-    }
-
-    /**
-     * Returns the current Step.
-     *
-     * @return Current step index
-     */
-    public String getCurrentStepName() {
-        return layout.getCurrentStepName();
-    }
-
-    /**
-     * Returns the current Step.
-     *
-     * @return Current step index
-     */
-    public Step getCurrentStep() {
-        return layout.getCurrentStep();
-    }
-
-    /**
-     * Returns the total number of steps.
-     *
-     * @return Total number of steps
-     */
-    public int getTotalSteps() {
-        return layout.getSteps().size();
-    }
-
-    /**
-     * Adds a step to this panel.
-     *
-     * @param step Step to add
-     */
-    public void addStep(final SwingStep step) {
-        add(step, step.getStepName());
-    }
-
-    /**
-     * Shows the first step.
-     */
-    public void showFirst() {
-        layout.first(this);
-    }
-
-    /**
-     * Shows the last step.
-     */
-    public void showLast() {
-        layout.last(this);
-    }
-
-    /**
-     * Shows the next step.
-     */
-    public void nextStep() {
-        layout.next(this);
-    }
-
-    /**
-     * Shows the previous step.
-     */
-    public void previousStep() {
-        layout.previous(this);
-    }
-
-    /**
-     * Shows the specified step.
-     *
-     * @param step Step index
-     */
-    public void showStep(final int step) {
-        layout.show(step, this);
-    }
-}