JWrappingLabel no longer breaks the wizards

Windows installer won't build if wget.exe or 7zS.sfx are not found
Linux launcher now passes params with spaces in them correctly to the client
DoReports now also sources ${HOME}/.bashrc to get the correct classpath


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

DoReports.sh

@@ -1,7 +1,8 @@
 #!/bin/sh
 
-# cron doesn't seem to like doing this iself...
+# cron doesn't do this
 . /etc/profile
+. ${HOME}/.bashrc
 
 # Path to trunk
 MYDIR="/home/dmdirc/google"
@@ -25,7 +26,9 @@ else
 fi
 
 # Run junit issue notifier
-$SCRIPTDIR/junit-failures.php
+if [ -e "$SCRIPTDIR/junit-failures.php" ]; then
+	$SCRIPTDIR/junit-failures.php
+fi
 
 # Oblong junit announcement
 LINE=`cat junitreports/overview-summary.html | grep "%</td"`

installer/windows/makeInstallerWindows.sh

@@ -472,6 +472,11 @@ if [ ! -e "wget.exe" ]; then
 	wget "http://users.ugent.be/~bpuype/cgi-bin/fetch.pl?dl=wget/wget.exe"
 fi;
 
+if [ ! -e "wget.exe" ]; then
+	echo "wget.exe not found, unable to continue."
+	exit 1;
+fi;
+
 FILES="${FILES} wget.exe"
 
 compress $FILES
@@ -495,6 +500,11 @@ if [ ! -e "7zS.sfx" ]; then
 	rm 7zextra.tar.bz2
 fi
 
+if [ ! -e "7zS.sfx" ]; then
+	echo "7zS.sfx not found, unable to continue."
+	exit 1;
+fi;
+
 echo "Creating .exe"
 cat 7zS.sfx 7zip.conf "${INTNAME}" > "${RUNNAME}"
 

launcher/linux/DMDirc.sh

@@ -25,7 +25,18 @@
 
 LAUNCHERVERSION="1"
 
-params="${@}"
+params=""
+
+# Store params so that we can pass them back to the client
+for param in "$@"; do
+	SPACE=`echo "${param}" | grep " "`
+	if [ "${SPACE}" != "" ]; then
+		niceParam=`echo "${param}" | sed 's/"/\\\\"/g'`
+		params=${params}" \"${niceParam}\""
+	else
+		params=${params}" ${param}"
+	fi;
+done;
 
 # Check for some CLI params
 profiledir="${HOME}/.DMDirc/"

src/com/dmdirc/ui/swing/JWrappingLabel.java

@@ -130,7 +130,12 @@ public class JWrappingLabel extends JComponent {
 
 	/** {@inheritDoc} */
 	public Dimension getMinimumSize() {
-		return getPreferredSize();
+		if (isMinimumSizeSet()) {
+			return super.getMinimumSize();
+		} else {
+			doPaint(getGraphics(), true);
+			return new Dimension(0, myPreferredHeight);
+		}
 	}
 
 	/** {@inheritDoc} */