Rather than just including an old version of the functions in the launcher, build in functions.sh from the installer.

This really negates the need to even include functions.sh when it exists but I'll leave that in for now.

Change-Id: I579dff3cae8930f43eea04780fa60cb55738a7d3
Reviewed-on: http://gerrit.dmdirc.com/434
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>

launcher/createUpdate.sh

@@ -6,9 +6,46 @@ LAUNCHERUPDATEDIR="/home/dmdirc/www/updates/launchers/"
 UNIXVERSION=`cat ${LAUNCHERDIR}/unix/DMDirc.sh | grep LAUNCHERVERSION= | awk -F\" '{print $2}'`
 WINDOWSVERSION=`cat ${LAUNCHERDIR}/windows/DMDirc.dpr | grep "launcherVersion: String =" | awk -F\' '{print $2}'`
 
+# 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;
+
 if [ ! -e "${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh" ]; then
 	echo "Creating Launcher Update: unix-${UNIXVERSION}";
-	cp -${LAUNCHERDIR}/unix/DMDirc.sh ${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.sh
+	
+	FUNCTIONSFILE="${LAUNCHERDIR}/../installer/linux/functions.sh"
+	SRCFILE=${LAUNCHERDIR}/unix/DMDirc.sh
+	DESTFILE=${LAUNCHERUPDATEDIR}/unix-${UNIXVERSION}.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;
 fi;
 
 if [ ! -e "${LAUNCHERUPDATEDIR}/windows-${WINDOWSVERSION}.zip" ]; then

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="13"
+LAUNCHERVERSION="14"
 LAUNCHERINFO="unix-${LAUNCHERVERSION}"
 
 params=""
@@ -72,87 +72,10 @@ if [ -e "functions.sh" ]; then
 	. `dirname $0`/functions.sh
 else
 	# TODO: Remove this and depend on functions.sh...
-	echo "Unable to find functions.sh, using old functions"
+	echo "Unable to find functions.sh, using built in functions"
 	
-	# Check for OS X
-	OSASCRIPT=`which osascript`
-	KERNEL=`uname -s`
-	ISOSX="0"
-	# Kernel is darwin, and osascript exists, probably OS X!
-	if [ "${KERNEL}" = "Darwin" -a "" != "${OSASCRIPT}" ]; then
-		ISOSX="1"
-	fi;
-
-	if [ "${ISOSX}" != "1" ]; then
-		PIDOF=`which pidof`
-		if [ "${PIDOF}" = "" ]; then
-			# For some reason some distros hide pidof...
-			if [ -e /sbin/pidof ]; then
-				PIDOF=/sbin/pidof
-			elif [ -e /usr/sbin/pidof ]; then
-				PIDOF=/usr/sbin/pidof
-			fi;
-		fi;
-		
-		## Helper Functions
-		if [ "${PIDOF}" != "" ]; then
-			ISKDE=`${PIDOF} -x -s kdeinit`
-			ISGNOME=`${PIDOF} -x -s gnome-panel`
-		else
-			ISKDE=`ps -Af | grep kdeinit | grep -v grep`
-			ISGNOME=`ps -Af | grep gnome-panel | grep -v grep`
-		fi;
-		KDIALOG=`which kdialog`
-		ZENITY=`which zenity`
-		KSUDO=`which kdesudo`
-		GSUDO=`which gksudo`
-	fi;
-	
-	errordialog() {
-		# Send message to console.
-		echo ""
-		echo "-----------------------------------------------------------------------"
-		echo "Error: ${1}"
-		echo "-----------------------------------------------------------------------"
-		echo "${2}"
-		echo "-----------------------------------------------------------------------"
+	###FUNCTIONS_FILE###
 	
-		if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-			echo "Displaying dialog.."
-			${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"${1}\n${2}\" buttons {\"Ok\"} with icon stop" -e 'end tell'
-		else
-			if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
-				echo "Dialog on Display: ${DISPLAY}"
-				${KDIALOG} --title "DMDirc: ${1}" --error "${1}\n\n${2}"
-			elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-				echo "Dialog on Display: ${DISPLAY}"
-				${ZENITY} --error --title "DMDirc: ${1}" --text "${1}\n\n${2}"
-			fi
-		fi;
-	}
-	
-	messagedialog() {
-		# Send message to console.
-		echo ""
-		echo "-----------------------------------------------------------------------"
-		echo "Info: ${1}"
-		echo "-----------------------------------------------------------------------"
-		echo "${2}"
-		echo "-----------------------------------------------------------------------"
-	
-		if [ "${ISOSX}" = "1" -a "" != "${OSASCRIPT}" ]; then
-			echo "Displaying dialog.."
-			${OSASCRIPT} -e 'tell application "System Events"' -e "activate" -e "display dialog \"${1}\n${2}\" buttons {\"Ok\"} giving up after 120 with icon note" -e 'end tell'
-		else
-			if [ "" != "${ISKDE}" -a "" != "${KDIALOG}" -a "" != "${DISPLAY}" ]; then
-				echo "Dialog on Display: ${DISPLAY}"
-				${KDIALOG} --title "DMDirc: ${1}" --msgbox "${1}\n\n${2}"
-			elif [ "" != "${ISGNOME}" -a "" != "${ZENITY}" -a "" != "${DISPLAY}" ]; then
-				echo "Dialog on Display: ${DISPLAY}"
-				${ZENITY} --info --title "DMDirc: ${1}" --text "${1}\n\n${2}"
-			fi
-		fi;
-	}
 fi;
 
 # Check to see if we can bspatch things