makeInstallerLinux.sh now no longer deletes functions.sh when it finishes

makeInstallerLinux.sh now includes the contents of funtions.sh into the installer stub so that it can run...

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

installer/linux/installerstub.sh

@@ -65,22 +65,7 @@ fi;
 
 ###ADDITIONAL_STUFF###
 
-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;
-
-if [ -e "functions.sh" ]; then
-	. functions.sh
-else
-	echo "Unable to find functions.sh, unable to continue."
-	exit 1;
-fi;
+###FUNCTIONS_FILE###
 
 # Location of .run stub end
 ENDLINE=`grep ${GREPOPTS} "^###END STUB###$" $0`

installer/linux/makeInstallerLinux.sh

@@ -268,7 +268,28 @@ fi
 
 echo "Creating .run file"
 echo "Adding stub.."
-cat installerstub.sh > ${RUNNAME}
+
+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;
+
+FUNCTIONSLINE=`grep ${GREPOPTS} "^###FUNCTIONS_FILE###$" installerstub.sh`
+FUNCTIONSLINE=$((${FUNCTIONSLINE%%:*} + 0))
+
+head -n ${FUNCTIONSLINE} installerstub.sh  > ${RUNNAME}
+cat functions.sh >> ${RUNNAME}
+echo "" >> ${RUNNAME}
+tail ${TAILOPTS}$((${FUNCTIONSLINE%%:*} + 1)) installerstub.sh >> ${RUNNAME}
 
 # Add release info.
 if [ $isSVN -eq 1 ]; then
@@ -439,12 +460,14 @@ mv getjre.sh getjre.sh.tmp
 mv installjre.sh installjre.sh.tmp
 mv progressbar.sh progressbar.sh.tmp
 mv uninstall.sh uninstall.sh.tmp
+mv functions.sh functions.sh.tmp
 rm -f ${FILES}
 mv setup.sh.tmp setup.sh
 mv getjre.sh.tmp getjre.sh
 mv installjre.sh.tmp installjre.sh
 mv progressbar.sh.tmp progressbar.sh
 mv uninstall.sh.tmp uninstall.sh
+mv functions.sh.tmp functions.sh
 
 echo "-----------"
 echo "Done."