Be more intelligent when looking for functions.sh, and correctly build functions.sh into the launcher when building the installer.

Change-Id: I7d7b5dff75bcd4ed89e92b9add69cc9d398870c0
Reviewed-on: http://gerrit.dmdirc.com/946
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>

installer/linux/getjre.sh

@@ -26,6 +26,16 @@ else
 	fi;
 fi
 
+# Find out where we are
+BASEDIR=${0%/*}
+if [ "${BASEDIR}" = "${0}" ]; then
+	BASEDIR=`which $0`
+	BASEDIR=${BASEDIR%/*}
+fi
+if [ "${BASEDIR:0:1}" != "/" ]; then
+	BASEDIR=${PWD}/${BASEDIR}
+fi;
+
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then
 	# For some reason some distros hide pidof...
@@ -37,7 +47,7 @@ if [ "${PIDOF}" = "" ]; then
 fi;
 
 if [ -e "functions.sh" ]; then
-	. `dirname $0`/functions.sh
+	. ${BASEDIR}/functions.sh
 else
 	echo "Unable to find functions.sh, unable to continue."
 	exit 1;

installer/linux/installjre.sh

@@ -41,6 +41,16 @@ else
 	fi;
 fi
 
+# Find out where we are
+BASEDIR=${0%/*}
+if [ "${BASEDIR}" = "${0}" ]; then
+	BASEDIR=`which $0`
+	BASEDIR=${BASEDIR%/*}
+fi
+if [ "${BASEDIR:0:1}" != "/" ]; then
+	BASEDIR=${PWD}/${BASEDIR}
+fi;
+
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then
 	# For some reason some distros hide pidof...
@@ -54,7 +64,7 @@ fi;
 ISFREEBSD=`uname -s | grep -i FreeBSD`
 
 if [ -e "functions.sh" ]; then
-	. `dirname $0`/functions.sh
+	. ${BASEDIR}/functions.sh
 else
 	echo "Unable to find functions.sh, unable to continue."
 	exit 1;

installer/linux/makeInstallerLinux.sh

@@ -301,7 +301,29 @@ elif [ -e "${DOCSDIR}/CHANGELOG.TXT" ]; then
 fi
 
 if [ -e "${jarPath}/launcher/unix" ]; then
-	ln -sf ${jarPath}/launcher/unix/DMDirc.sh .
+	# Hax in functions.sh
+	FUNCTIONSFILE="functions.sh"
+	SRCFILE=${jarPath}/launcher/unix/DMDirc.sh
+	DESTFILE=./DMDirc.sh
+
+	if [ -e "${FUNCTIONSFILE}" ]; then
+		FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" ${SRCFILE}`
+		if [ "${FUNCTIONSLINE}" == "" ]; then
+			echo "    Functions already built into launcher."
+			cp ${SRCFILE} ${DESTFILE}
+		else
+			echo "    Including functions.sh into launcher."
+			FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
+
+			head -n ${FUNCTIONSLINE} ${SRCFILE} > ${DESTFILE}
+			cat functions.sh >> ${DESTFILE}
+			echo "" >> ${DESTFILE}
+			tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) ${SRCFILE} >> ${DESTFILE}
+		fi;
+	else
+		echo "    Unable to create unix launcher update, no functions.sh found."
+	fi;
+	
 	FILES="${FILES} DMDirc.sh"
 fi
 

installer/linux/setup.sh

@@ -46,6 +46,16 @@ else
 	fi;
 fi
 
+# Find out where we are
+BASEDIR=${0%/*}
+if [ "${BASEDIR}" = "${0}" ]; then
+	BASEDIR=`which $0`
+	BASEDIR=${BASEDIR%/*}
+fi
+if [ "${BASEDIR:0:1}" != "/" ]; then
+	BASEDIR=${PWD}/${BASEDIR}
+fi;
+
 PIDOF=`which pidof`
 if [ "${PIDOF}" = "" ]; then
 	# For some reason some distros hide pidof...
@@ -57,7 +67,7 @@ if [ "${PIDOF}" = "" ]; then
 fi;
 
 if [ -e "functions.sh" ]; then
-	. `dirname $0`/functions.sh
+	. ${BASEDIR}/functions.sh
 else
 	echo "Unable to find functions.sh, unable to continue."
 	exit 1;

installer/linux/uninstall.sh

@@ -1,13 +1,46 @@
 #!/bin/sh
 
-if [ ! -e `dirname $0`/.uninstall.conf ]; then
+# 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
+
+# Find out where we are
+BASEDIR=${0%/*}
+if [ "${BASEDIR}" = "${0}" ]; then
+	BASEDIR=`which $0`
+	BASEDIR=${BASEDIR%/*}
+fi
+if [ "${BASEDIR:0:1}" != "/" ]; then
+	BASEDIR=${PWD}/${BASEDIR}
+fi;
+
+if [ ! -e ${BASEDIR}/.uninstall.conf ]; then
 	echo "No .uninstall.conf found, unable to continue."
 	exit 1;
 else
 	INSTALLED_AS_ROOT=""
 	INSTALL_LOCATION=""
 	
-	. `dirname $0`/.uninstall.conf
+	. ${BASEDIR}/.uninstall.conf
 
 	if [ "${INSTALL_LOCATION}" = "" ]; then
 		echo "Unable to read .uninstall.conf, unable to continue."
@@ -28,7 +61,7 @@ fi;
 JAVA=`which java`
 
 if [ -e "functions.sh" ]; then
-	. `dirname $0`/functions.sh
+	. ${BASEDIR}/functions.sh
 else
 	echo "Unable to find functions.sh, unable to continue."
 	exit 1;

launcher/unix/DMDirc.sh

@@ -23,7 +23,7 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-LAUNCHERVERSION="14"
+LAUNCHERVERSION="15"
 LAUNCHERINFO="unix-${LAUNCHERVERSION}"
 
 params=""
@@ -51,6 +51,16 @@ else
 	fi;
 fi
 
+# Find out where we are
+BASEDIR=${0%/*}
+if [ "${BASEDIR}" = "${0}" ]; then
+	BASEDIR=`which $0`
+	BASEDIR=${BASEDIR%/*}
+fi
+if [ "${BASEDIR:0:1}" != "/" ]; then
+	BASEDIR=${PWD}/${BASEDIR}
+fi;
+
 # Store params so that we can pass them back to the client
 for param in "$@"; do
 	if [ "${param}" = "--noprofile" -o "${param}" = "--updateonly" ]; then 
@@ -69,13 +79,10 @@ for param in "$@"; do
 done;
 
 if [ -e "functions.sh" ]; then
-	. `dirname $0`/functions.sh
+	. ${BASEDIR}/functions.sh
 else
-	# TODO: Remove this and depend on functions.sh...
 	echo "Unable to find functions.sh, using built in functions"
-	
 	###FUNCTIONS_FILE###
-	
 fi;
 
 # Check to see if we can bspatch things
@@ -153,10 +160,10 @@ getConfigOption() {
 }
 
 if [ "${ISOSX}" = "1" ]; then
-	jarDir=`dirname $0`/../Resources/Java/
+	jarDir=${BASEDIR}/../Resources/Java/
 	jar=${jarDir}DMDirc.jar
 else
-	jar=`dirname $0`/DMDirc.jar
+	jar=${BASEDIR}/DMDirc.jar
 fi
 launcherUpdater=${profiledir}/updateLauncher.sh
 BSDJava1="/usr/local/jdk1.6.0/jre/bin/java"
@@ -191,12 +198,14 @@ elif [ -e "${profiledir}/.launcher.sh" ]; then
 	echo "Found!";
 	echo "Attempting to update..";
 
+	# The code below intentionally doesn't use the FUNCTIONS_FILE include as it
+	# wouldn't correctly escape \${0} and \${2} where needed and thus stuff would
+	# break!
 	cat <<EOF> ${launcherUpdater}
-		cd `dirname $0`
+		cd ${BASEDIR}
 		if [ -e "functions.sh" ]; then
-			. `dirname $0`/functions.sh
+			. ${BASEDIR}/functions.sh
 		else
-			# TODO: Remove this and depend on functions.sh...
 			echo "Unable to find functions.sh, using old functions"
 			errordialog() {
 				# Send message to console.