Lotsa changes to the linux installer to make it also run on OpenSolaris (and possibly normal solaris aswell, I don't have gui access to a normal solaris machine from here will try when I go back to uni)

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

installer/linux/getjre.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
+
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then
 	# For some reason some distros hide pidof...
 	ISKDE=`${PIDOF} -x -s kdeinit`
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
 else
-	ISKDE=`ps ux | grep kdeinit | grep -v grep`
-	ISGNOME=`ps ux | grep gnome-panel | grep -v grep`
+	ISKDE=`ps -Af | grep kdeinit | grep -v grep`
+	ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
 fi;
 KDIALOG=`which kdialog`
 ZENITY=`which zenity`
 	fi
 }
 
+# Get the JRE.
 ARCH=`uname -m`
-# This page redirects us to the correct JRE
-URL="http://www.dmdirc.com/getjava/linux/`uname -m`"
+ISAINFO=`which isainfo`
+if [ "${ISAINFO}" != "" ]; then
+	# Solaris-ish
+	ARCH=`uname -p`
+fi;
+URL="http://www.dmdirc.com/getjava/`uname -s`/${ARCH}"
 
 length=`wget --spider ${URL} 2>&1 | grep "Length:"| awk '{print $2, $3}' | sed 's/,//g'`
 actualLength=${length%% *}
 niceLength=`echo ${length##* }  | sed 's/[()]//g'`
 
+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.
 	if [ "${PIPE}" != "" ]; then
 		if [ -e ${PIPE} ]; then
 			echo "quit" > ${PIPE}
-			rm -Rf ${PIPE}
+			echo "Closing badly, pipe still exists."
 		fi
 	fi
 }
 fi;
 if [ $result -eq 0 ]; then
 	PIPE=`mktemp -p ${PWD} progresspipe.XXXXXXXXXXXXXX`
-	/bin/sh ${PWD}/progressbar.sh "Downloading JRE.." ${actualLength} ${PIPE} &
 	wget -q ${URL} -O jre.bin &
 	wgetpid=${!}
-	while [ `ps ${wgetpid} | wc -l` = 2 ]; do
+	/bin/sh ${PWD}/progressbar.sh "Downloading JRE.." ${actualLength} ${PIPE} ${wgetpid} &
+	progressbarpid=${!}
+	while [ `ps -p ${wgetpid} | wc -l` = 2 ]; do
 		SIZE=`ls -l jre.bin | awk '{print $5}'`
 		if [ -e ${PIPE} ]; then
 			echo "${SIZE}" > ${PIPE}
 		fi;
 	done;
 	wgetpid=""
-	echo "quit" > ${PIPE}
+#	echo "Killing progressbar"
+#	kill ${progressbarpid}
 	messagedialog "Download Completed" "Download Completed"
-	exit 1;
+	if [ -e ${PIPE} ]; then
+		echo "Deleting Pipe ${PIPE}"
+		rm -Rf "${PIPE}"
+	fi;
+	exit 0;
 else
 	messagedialog "Download JRE" "JRE Download Canceled"
-fi;
+	exit 1;
+fi;
+exit 1;

installer/linux/installerstub.sh

 
 MD5=""
 
-# Check the which command exists
+# 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###
 
 		ISKDE=`${PIDOF} -x -s kdeinit`
 		ISGNOME=`${PIDOF} -x -s gnome-panel`
 	else
-		ISKDE=`ps ux | grep kdeinit | grep -v grep`
-		ISGNOME=`ps ux | grep gnome-panel | grep -v grep`
+		ISKDE=`ps -Af | grep kdeinit | grep -v grep`
+		ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
 	fi;
 	KDIALOG=`which kdialog`
 	ZENITY=`which zenity`
 }
 
 # Location of .run stub end
-ENDLINE=`grep -na "^###END STUB###$" $0`
+ENDLINE=`grep ${GREPOPTS} "^###END STUB###$" $0`
 ENDLINE=$((${ENDLINE%%:*} + 1))
 
 if [ "" = "${ENDLINE}" ]; then
 }
 
 uncompress() {
-	tail -n +${ENDLINE} "${OLDPWD}/$0" | gzip -cd | tar -xvf - 2>/dev/null || {
+#	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>/dev/null"
+	OUTPUT=`tail ${TAILOPTS}${ENDLINE} "${FILE}" | gzip -cd | tar -xvf - 2>/dev/null`
+	if [ "${OUTPUT}" = "" ]; then
 		echo "Decompression failed."
-		kill -15 $$;
-	};
+		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() {
 AWK=`which awk`
 getMD5() {
 	# Everything below the MD5SUM Line
-	MD5LINE=`grep -na "^MD5=\".*\"$" ${1}`
+	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
 	MD5LINE=$((${MD5LINE%%:*} + 1))
 
-	MD5SUM=`tail -n +${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
+	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
 	return;
 }
 

installer/linux/installjre.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
+
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then
 	# For some reason some distros hide pidof...
 	ISKDE=`${PIDOF} -x -s kdeinit`
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
 else
-	ISKDE=`ps ux | grep kdeinit | grep -v grep`
-	ISGNOME=`ps ux | grep gnome-panel | grep -v grep`
+	ISKDE=`ps -Af | grep kdeinit | grep -v grep`
+	ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
 fi;
 KDIALOG=`which kdialog`
 ZENITY=`which zenity`
 	FILE=`mktemp -p ${PWD} license.XXXXXXXXXXXXXX`
 	
 	# Location of license start
-	STARTLINE=`grep -na "^more <<\"EOF\"$" jre.bin`
+	STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
 	STARTLINE=$((${STARTLINE%%:*} + 1))
 	# Location of license end
-	ENDLINE=`grep -na "Do you agree to the above license terms?" jre.bin`
+	ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
 	ENDLINE=$((${ENDLINE%%:*} - 2))
 	
-	head -n ${ENDLINE} jre.bin | tail -n +${STARTLINE} > ${FILE}
+	head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
 	
 	# Send text to console.
 	echo ""
 questiondialog "Java Install" "Do you agree to the Java License?"
 if [ $? -eq 0 ]; then
 	# Look to see where the JRE wants to install to
-	JREJAVAHOME=`grep -na "^javahome=" jre.bin`
+	JREJAVAHOME=`grep ${GREPOPTS} "^javahome=" jre.bin`
  	JREJAVAHOME=${JREJAVAHOME##*=}
 	
+	echo "JREJAVAHOME: ${JREJAVAHOME}"
+	
 	if [ "${UID}" = "" ]; then
 		UID=`id -u`;
 	fi
 		installdir=${HOME}/${JREJAVAHOME}
 	fi;
 	
-	if [ -e ${installdir} ]; then
+	echo "installdir: ${installdir}"
+	
+	if [ ! -e ${installdir} ]; then
 		# Hack jre.bin to allow us to install without asking for a license, or failing
 		# the checksum.
 		
 		# Location of license start
-		STARTLINE=`grep -na "^more <<\"EOF\"$" jre.bin`
+		STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
 		STARTLINE=${STARTLINE%%:*}
 		# Location of license end
-		ENDLINE=`grep -na "If you don't agree to the license you can't install this software" jre.bin`
+		ENDLINE=`grep ${GREPOPTS} "If you don't agree to the license you can't install this software" jre.bin`
 		ENDLINE=$((${ENDLINE%%:*} + 3))
 		# Location of checksum start
-		CSSTARTLINE=`grep -na "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
+		CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
 		CSSTARTLINE=${CSSTARTLINE%%:*}
 		# Location of checksum end
-		CSENDLINE=`grep -na "Can't find /usr/bin/sum to do checksum" jre.bin`
+		CSENDLINE=`grep ${GREPOPTS} "Can't find /usr/bin/sum to do checksum" jre.bin`
 		CSENDLINE=$((${CSENDLINE%%:*} + 2))
 		# Location of script end
-		SCENDLINE=`grep -na "^echo \"Done.\"$" jre.bin`
+		SCENDLINE=`grep ${GREPOPTS} "^echo \"Done.\"$" jre.bin`
 		SCENDLINE=$((${SCENDLINE%%:*} + 2 - (${ENDLINE} - ${STARTLINE}) - (${CSENDLINE} - ${CSSTARTLINE})))
 		# Remove the license and checksum stuff!
 		head -n $((${STARTLINE} -1)) jre.bin > jre.bin.tmp
-		tail -n +$((${ENDLINE})) jre.bin | head -n $((${CSSTARTLINE} -1 - ${ENDLINE})) >> 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 -n +$((${CSENDLINE})) jre.bin >> jre.bin.tmp
+		tail ${TAILOPTS}$((${CSENDLINE})) jre.bin >> jre.bin.tmp
 		
 		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."
 		yes | sh jre.bin.tmp
 				echo "endfi" >> ${HOME}/.cshrc
 			fi
 			
+			echo "Adding JREPath: ${PWD}/jrepath"
 			# This allows the main installer to continue with the new java version.
-			echo "export PATH=~/${JREJAVAHOME}/bin:\"\${PATH}\"" > .jrepath
+			echo "export PATH=~/${JREJAVAHOME}/bin:\"\${PATH}\"" > ${PWD}/jrepath
 			
 			# This allows dmdirc launcher to find the jre if the path is not set.
 			ln -sf ${installdir} ${HOME}/jre
 		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."
-		echo "export PATH=~/${JREJAVAHOME}/bin:\"\${PATH}\"" > .jrepath
+		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 JREPath: ${PWD}/jrepath"
+		# This allows the main installer to continue with the new java version.
+		echo "export PATH=~/${JREJAVAHOME}/bin:\"\${PATH}\"" > ${PWD}/jrepath
 		exit 0;
 	fi;
 else

installer/linux/makeInstallerLinux.sh

 # 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} || {
 
 getMD5Linux() {
 	# Everything below the MD5SUM Line
-	MD5LINE=`grep -na "^MD5=\".*\"$" ${1}`
+	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
 	MD5LINE=$((${MD5LINE%%:*} + 1))
 
-	MD5SUM=`tail -n +${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
+	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} - | ${AWK} '{print $1}'`
 	return;
 }
 
 getMD5OSX() {
 	# Everything below the MD5SUM Line
-	MD5LINE=`grep -na "^MD5=\".*\"$" ${1}`
+	MD5LINE=`grep ${GREPOPTS} "^MD5=\".*\"$" ${1}`
 	MD5LINE=$((${MD5LINE%%:*} + 1))
 
-	MD5SUM=`tail -n +${MD5LINE} "${1}" | ${MD5BIN} | ${AWK} '{print $1}'`
+	MD5SUM=`tail ${TAILOPTS}${MD5LINE} "${1}" | ${MD5BIN} | ${AWK} '{print $1}'`
 	return;
 }
 
 
 	echo "SUM obtained is: ${MD5SUM}"
 
-	LINENUM=`grep -na "^MD5=\"\"$" ${RUNNAME}`
+	LINENUM=`grep ${GREPOPTS} "^MD5=\"\"$" ${RUNNAME}`
 	LINENUM=${LINENUM%%:*}
 
 	head -n $((${LINENUM} -1)) ${RUNNAME} > ${RUNNAME}.tmp
 	echo 'MD5="'${MD5SUM}'"' >> ${RUNNAME}.tmp
-	tail -n +$((${LINENUM} +1)) ${RUNNAME} >> ${RUNNAME}.tmp
+	tail ${TAILOPTS}$((${LINENUM} +1)) ${RUNNAME} >> ${RUNNAME}.tmp
 	mv ${RUNNAME}.tmp ${RUNNAME}
 else
 	echo "Not Adding MD5.."

installer/linux/progressbar.sh

 # 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...
 	ISKDE=`${PIDOF} -x -s kdeinit`
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
 else
-	ISKDE=`ps ux | grep kdeinit | grep -v grep`
-	ISGNOME=`ps ux | grep gnome-panel | grep -v grep`
+	ISKDE=`ps -Af | grep kdeinit | grep -v grep`
+	ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
 fi;
 KDIALOG=`which kdialog`
 ZENITY=`which zenity`
 CAPTION=${1}
 FILESIZE=${2}
+WGETPID=${3}
 progresswindow=""
 TYPE=""
 PIPE="progresspipe_${$}"
 retval="1"
+CONTINUE="1"
 
 readprogress() {
 	data=""
 	input=""
-	while [ -e ${PIPE} ]; do
+	while [ ${CONTINUE} -eq "1" -a -e ${PIPE} ]; do
 		if [ "${TYPE}" = "KDE" ]; then
 			if [ `dcop ${progresswindow} wasCancelled` = "true" ]; then
 				break;
 			fi
 		fi;
-		input=`cat "${PIPE}"`
-		if [ "${input}" == "quit" ]; then
+		input=`cat "${PIPE}" | tail ${TAILOPTS}1`
+		if [ "${input}" = "quit" ]; then
 			break;
 		elif [ "${input}" != "" ]; then
 			data=${input}
 			fi;
 			if [ "${val}" = "100" ]; then
 				retval="0"
+				CONTINUE="0"
 				break;
 			fi;
 		fi;
 fi;
 
 echo "Using pipe: "${PIPE}
-
 mkfifo "${PIPE}"
 closeProgress() {
+	CONTINUE="0"
 	if [ "${TYPE}" = "KDE" -a ${retval} != "0" ]; then
 		dcop ${progresswindow} close
 	fi;
-	echo "Deleting ${PIPE}"
-	rm -Rf "${PIPE}"
+	echo "Exiting with value: $retval"
+	if [ -e ${PIPE} ]; then
+		echo "Attempting to kill wget"
+		kill -9 ${WGETPID}
+		echo "Emptying pipe"
+		cat ${PIPE};
+		echo "Deleting Pipe ${PIPE}"
+		rm -Rf "${PIPE}"
+	fi;
 	exit $retval;
 }
 trap 'closeProgress' INT TERM EXIT
 	dcop ${progresswindow} showCancelButton true
 	TYPE="KDE"
 	readprogress
+	CONTINUE="0"
+	echo "Progress Bar Complete"
 elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
 	echo "Progress dialog on Display: ${DISPLAY}"
 	TYPE="GNOME"
 	readprogress | ${ZENITY} --progress --auto-close --auto-kill --title "DMDirc: ${CAPTION}" --text "${CAPTION}"
+	CONTINUE="0"
+	echo "Progress Bar Complete"
 else
 	echo "Progress For: ${CAPTION}"
 	echo "-> 0%"
 	readprogress
+	CONTINUE="0"
 	echo ""
 	echo "Finished!"
-fi
+fi
+echo "Exiting progressbar"
+exit 0;

installer/linux/setup.sh

 # 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
+
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then
 	# For some reason some distros hide pidof...
 	ISKDE=`${PIDOF} -x -s kdeinit`
 	ISGNOME=`${PIDOF} -x -s gnome-panel`
 else
-	ISKDE=`ps ux | grep kdeinit | grep -v grep`
-	ISGNOME=`ps ux | grep gnome-panel | grep -v grep`
+	ISKDE=`ps -Af | grep kdeinit | grep -v grep`
+	ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
 fi;
 KDIALOG=`which kdialog`
 ZENITY=`which zenity`
 }
 
 UNAME=`uname -a`
-isLinux=`echo ${UNAME} | grep -i linux`
 
 echo ""
 echo "---------------------"
 		result=$?
 	fi;
 	if [ ${result} -ne 0 ]; then
-		if [ "upgrade" != "${1}" ]; 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 ".jrepath" ]; then
-			. .jrepath
-			JAVA=`which java`
+		if [ -e "${PWD}/jrepath" ]; then
+			echo "Found JREPath: ${PWD}/jrepath"
+			. ${PWD}/jrepath
 		fi;
+		JAVA=`which java`
 	fi;
 }
 
 	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
 
 		echo "Running installer.."
 		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${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 com.dmdirc.installer.Main ${isRoot}${isRelease}