Add --help to installer.

Use --help to check if java is the right version (like the launcher), rather than just running the installer and moaning if it exits with non 0.
Fixes issue 1479


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

installer/linux/setup.sh

@@ -200,15 +200,18 @@ if [ -e "DMDirc.jar" ]; then
 	if [ "${scriptOnly}" = "true" ]; then
 		echo "Script-only install requested."
 	else
-		echo "Running installer.."
-		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
+		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 again.."
+			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}
 		fi
 		exit 0;
 	fi

installer/windows/Setup.dpr

@@ -460,7 +460,8 @@ begin
 		if (ReleaseNumber <> '') then begin
 			params := params+' --release '+ReleaseNumber;
 		end;
-		if (ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params) <> 0) then begin
+		// CHeck if the installer runs
+		if (ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main --help') <> 0) then begin
 			dowriteln('Failed!');
 			if not installJRE(true) then begin
 				showError('Sorry, DMDirc setup can not continue without an updated version of java.', false, false);
@@ -470,6 +471,9 @@ begin
 				// Try again now that java is installed.
 				ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
 			end;
+		else begin
+			// Java is the right version, run the installer
+			ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
 		end;
 end
 	else begin

src/com/dmdirc/installer/Main.java

@@ -139,6 +139,8 @@ public final class Main implements WizardListener {
 	 */
 	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"));
@@ -177,6 +179,10 @@ public final class Main implements WizardListener {
 	 */
 	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();
 	}