Linux installer now runs on PCBSD (And probably other BSDs) if java/java6 is pre-installed.

Linux installer now gives a nicer error to mac users who try to run it.


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

installer/linux/setup.sh

@@ -23,10 +23,18 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-ISKDE=`pidof -x -s kdeinit`
-KDIALOG=`which kdialog`
-ISGNOME=`pidof -x -s gnome-panel`
-ZENITY=`which zenity`
+PIDOF=`which pidof`
+if [ "" != "${PIDOF}" ]; then
+	ISKDE=`${PIDOF} -x -s kdeinit`
+	KDIALOG=`which kdialog`
+	ISGNOME=`${PIDOF} -x -s gnome-panel`
+	ZENITY=`which zenity`
+else
+	ISKDE=""
+	KDIALOG=""
+	ISGNOME=""
+	ZENITY=""
+fi;
 
 errordialog() {
 	# Send message to console.
@@ -47,12 +55,20 @@ errordialog() {
 	fi
 }
 
+UNAME=`uname -a`
+isLinux=`echo ${UNAME} | grep -i linux`
+
 echo ""
 echo "---------------------"
 echo "Setup.sh"
 echo "---------------------"
 echo -n "Looking for java.. ";
-JAVA=`which 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
+	JAVA=`which java`
+fi
 
 installjre() {
 	result=1
@@ -97,6 +113,10 @@ if [ "" != "${JAVA}" ]; then
 	echo "Success!"
 else
 	echo "Failed!"
+	if [ "" == "${isLinux}" ]; then
+		errordialog "DMDirc Setup" "Sorry, DMDirc setup can not continue without java 6."
+		exit 1
+	fi;
 	installjre "install"
 fi
 
@@ -155,6 +175,10 @@ if [ -e "installer.jar" ]; then
 		echo "Running installer.."
 		${JAVA} -cp DMDirc.jar -jar installer.jar ${isRoot}${isRelease}
 		if [ $? -ne 0 ]; then
+			if [ "" == "${isLinux}" ]; then
+				errordialog "DMDirc Setup" "Sorry, DMDirc setup can not continue without java 6."
+				exit 1
+			fi;
 			installjre "upgrade"
 			echo "Trying to run installer again.."
 			${JAVA} -cp DMDirc.jar -jar installer.jar ${isRoot}${isRelease}

src/com/dmdirc/installer/Main.java

@@ -99,7 +99,7 @@ public final class Main implements WizardListener {
 		final String osName = System.getProperty("os.name");
 		wizardDialog.addStep(new StepWelcome(releaseName));
 		if (osName.startsWith("Mac OS")) {
-			wizardDialog.addStep(new StepError());
+			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));

src/com/dmdirc/installer/StepError.java

@@ -43,21 +43,25 @@ public final class StepError extends Step {
 	private static final long serialVersionUID = 2;
 	
 	/**
-	 * Creates a new instance of StepOne.
+	 * 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());
 		setBorder(BorderFactory.createEmptyBorder(LARGE_BORDER, LARGE_BORDER, SMALL_BORDER, LARGE_BORDER));
 		
 		JWrappingLabel infoLabel;
-		infoLabel = new JWrappingLabel("Sorry, it is not possible to install DMDirc on this system at this time.\n\n");
-//		infoLabel.setEditable(false);
-//		infoLabel.setWrapStyleWord(true);
-//		infoLabel.setLineWrap(true);
-//		infoLabel.setHighlighter(null);
+		infoLabel = new JWrappingLabel(message);
 		infoLabel.setOpaque(false);
-//		infoLabel.setBackground(getBackground());
 		infoLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, SMALL_BORDER, 0));
 			
 		add(infoLabel, BorderLayout.CENTER);