Start support for unattended installs.

Issue 1319


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

src/com/dmdirc/installer/Installer.java

@@ -35,35 +35,35 @@ import java.nio.channels.FileChannel;
  * @author Shane Mc Cormack
  */
 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;
-    }
+		/** 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 things happen. */
 	protected StepInstall step;
-    
+	
 	/**
 	 * Create a new Installer.
 	 */
 	public Installer() {
 		super("Installer-Thread");
-	}    
+	}
 	
 	/**
 	 * Get the default install location.
-     * 
-     * @return The default install location
+	 *
+	 * @return The default install location
 	 */
 	public abstract String defaultInstallLocation();
 	
@@ -80,7 +80,7 @@ public abstract class Installer extends Thread {
 	/**
 	 * This step performs the installation, via the StepInstall step.
 	 */
-    @Override
+	@Override
 	public final void run() {
 		step.performInstall(this);
 	}
@@ -107,8 +107,8 @@ public abstract class Installer extends Thread {
 		try {
 			final File dir = new File(".");
 			final FilenameFilter filter = new FilenameFilter() {
-                /** {@inheritDoc} */
-                @Override
+				/** {@inheritDoc} */
+				@Override
 				public boolean accept(final File dir, final String name) {
 					return name.charAt(0) != '.' && validFile(name);
 				}
@@ -160,8 +160,8 @@ public abstract class Installer extends Thread {
 	 * 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
+	 * @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()) {
@@ -184,7 +184,6 @@ public abstract class Installer extends Thread {
 	 * @param location Location where app was installed to.
 	 */
 	public void postInstall(final String location) {
-        // Nothing to do by default, installers may override
-    }
-    
+		// Nothing to do by default, installers may override
+	}
 }

src/com/dmdirc/installer/LinuxInstaller.java

@@ -47,7 +47,7 @@ public class LinuxInstaller extends Installer {
 	 * @param filename File to check
 	 * @return true If the file should be copied, else false.
 	 */
-    @Override
+	@Override
 	public boolean validFile(final String filename) {
 		return (!filename.equalsIgnoreCase("setup.sh") &&
 		        !filename.equalsIgnoreCase("getjre.sh") &&
@@ -56,7 +56,7 @@ public class LinuxInstaller extends Installer {
 	}
 
 	/** {@inheritDoc} */
-    @Override
+	@Override
 	public String defaultInstallLocation() {
 		String result = "";
 		if (CLIParser.getCLIParser().getParamNumber("-directory") > 0) {
@@ -78,7 +78,7 @@ public class LinuxInstaller extends Installer {
 	 * @param shortcutType Type of shortcut to check
 	 * @return True if this OS supports a given shortcut Type
 	 */
-    @Override
+	@Override
 	public boolean supportsShortcut(final ShortcutType shortcutType) {
 		switch (shortcutType) {
 			case QUICKLAUNCH:

src/com/dmdirc/installer/Main.java

@@ -42,8 +42,8 @@ import javax.swing.JOptionPane;
  * @author Shane Mc Cormack
  */
 public final class Main implements WizardListener {
-
-    /** Wizard dialog. */
+	
+	/** Wizard dialog. */
 	private static WizardFrame wizardDialog;
 	
 	/** Installer. */
@@ -51,7 +51,7 @@ public final class Main implements WizardListener {
 	
 	/** CLI Parser. */
 	private static CLIParser cli = CLIParser.getCLIParser();
-
+	
 	/**
 	 * Creates and Displays the Installer wizard.
 	 */
@@ -68,7 +68,7 @@ public final class Main implements WizardListener {
 		}
 		
 		setWizardFrame(new WizardFrame(releaseName + " Installer", new ArrayList<Step>(), this));
-        wizardDialog.setIconImage(IconManager.getIconManager().getImage("icon"));
+		wizardDialog.setIconImage(IconManager.getIconManager().getImage("icon"));
 		wizardDialog.setPreferredSize(new Dimension(400, 350));
 		wizardDialog.addWizardListener(this);
 
@@ -77,16 +77,18 @@ public final class Main implements WizardListener {
 		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 {
-			wizardDialog.addStep(new StepSettings());
-			wizardDialog.addStep(new StepConfirm(wizardDialog));
+			if (CLIParser.getCLIParser().getParamNumber("-unattended") == 0) {
+				wizardDialog.addStep(new StepSettings());
+				wizardDialog.addStep(new StepConfirm(wizardDialog));
+			}
 			wizardDialog.addStep(new StepInstall(wizardDialog));
 		}
 	}
-    
+		
 	/**
 	 * Called when the wizard finishes.
 	 */
-    @Override
+	@Override
 	public void wizardFinished() {
 		final Thread temp = myInstaller;
 		myInstaller = null;
@@ -97,17 +99,17 @@ public final class Main implements WizardListener {
 	/**
 	 * Called when the wizard is cancelled.
 	 */
-    @Override
+	@Override
 	public void wizardCancelled() {	
 		if (wizardDialog.getCurrentStep() != 3 && JOptionPane.showConfirmDialog(wizardDialog, "Are you sure you want to cancel?", "Cancel confirmation", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE) == JOptionPane.YES_OPTION) {
 			wizardDialog.dispose();
 		}
-	}    
+	}
 	
 	/**
 	 * Get the Installer object for this OS.
-     * 
-     * @return The installer for this OS
+	 *
+	 * @return The installer for this OS
 	 */
 	public static synchronized Installer getInstaller() {
 		if (myInstaller == null) {
@@ -133,6 +135,11 @@ public final class Main implements WizardListener {
 		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"));
 	}
 	
 	/**
@@ -158,8 +165,8 @@ public final class Main implements WizardListener {
 
 	/**
 	 * Run the installer.
-     * 
-     * @param args Command line arguments
+	 *
+	 * @param args Command line arguments
 	 */
 	public static void main(final String[] args) {
 		setupCLIParser();

src/com/dmdirc/installer/StepInstall.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.installer;
 
+import com.dmdirc.installer.cliparser.CLIParser;
 import com.dmdirc.installer.Installer.ShortcutType;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.dialogs.wizard.StepListener;
@@ -92,7 +93,11 @@ public final class StepInstall extends Step implements StepListener {
 	 */
 	public void performInstall(final Installer myInstaller) {
 		infoLabel.setText("Beginning Install..\n");
-		final String location = ((StepSettings) Main.getWizardFrame().getStep(1)).getInstallLocation();
+		
+		final boolean isUnattended = (CLIParser.getCLIParser().getParamNumber("-unattended") == 0);
+		final StepSettings settings = (isUnattended) ? new StepSettings() : ((StepSettings) Main.getWizardFrame().getStep(1));
+		
+		final String location = settings.getInstallLocation();
 
 		addText("Installing files to: "+location);
 		if (!myInstaller.doSetup(location)) {
@@ -102,8 +107,6 @@ public final class StepInstall extends Step implements StepListener {
 			return;
 		}
 
-		StepSettings settings = ((StepSettings) Main.getWizardFrame().getStep(1));
-
 		if (Main.getInstaller().supportsShortcut(ShortcutType.MENU)) {
 			if (settings.getShortcutMenuState()) {
 				addText("Setting up "+Main.getInstaller().getMenuName()+" shortcut");

src/com/dmdirc/installer/StepSettings.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.installer;
 
+import com.dmdirc.installer.cliparser.CLIParser;
 import com.dmdirc.installer.Installer.ShortcutType;
 import com.dmdirc.ui.swing.dialogs.wizard.Step;
 import com.dmdirc.ui.swing.components.TextLabel;
@@ -79,10 +80,10 @@ public final class StepSettings extends Step {
 //		infoLabel.setBackground(getBackground());
 		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 
-		shortcutMenu.setSelected(true);
-		shortcutDesktop.setSelected(true);
-		shortcutQuick.setSelected(true);
-		shortcutProtocol.setSelected(true);
+		shortcutMenu.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-menu") == 0));
+		shortcutDesktop.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-desktop") == 0));
+		shortcutQuick.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-quicklaunch") == 0));
+		shortcutProtocol.setSelected((CLIParser.getCLIParser().getParamNumber("-no-shortcut-protocol") == 0));
 
 		constraints.weightx = 1.0;
 		constraints.fill = constraints.BOTH;

src/com/dmdirc/installer/StreamReader.java

@@ -28,7 +28,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 
 public class StreamReader extends Thread {
-    
+	
 	/** This is the Input Stream we are reading */
 	private final InputStream stream;
 	
@@ -66,8 +66,8 @@ public class StreamReader extends Thread {
 		}
 	}
 
-    /** {@inheritDoc} */
-    @Override
+	/** {@inheritDoc} */
+	@Override
 	public void run() {
 		final BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
 		try {