Added a sleep 1 to give progressbar.sh time to open the pipe.

Sun appear have changed the generated .bin for java installs, fix code to hax information them!
(The previous quick commit fixes issue 3505)
Fixes issue 3506
Fixes issue 3507
Fixes issue 3508

Change-Id: I9161df477409782995041ad12a96debf0bec4e6e
Reviewed-on: http://gerrit.dmdirc.com/494
Automatic-Compile: DMDirc Local Commits <devs-public@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

installer/linux/getjre.sh

@@ -120,6 +120,7 @@ if [ $result -eq 0 ]; then
 		wgetpid=${!}
 	fi;
 	/bin/sh ${PWD}/progressbar.sh "Downloading JRE.." ${actualLength} ${PIPE} ${wgetpid} &
+	sleep 1;
 	progressbarpid=${!}
 	while [ `ps -p ${wgetpid} | wc -l` = 2 ]; do
 		SIZE=`ls -l jre.bin | awk '{print $5}'`

installer/linux/installjre.sh

@@ -85,7 +85,7 @@ showLicense() {
 		STARTLINE=$((${STARTLINE%%:*} + 1))
 		# Location of license end
 		ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
-		ENDLINE=$((${ENDLINE%%:*} - 2))
+		ENDLINE=$((${ENDLINE%%:*} - 4))
 		
 		head -n ${ENDLINE} jre.bin | tail ${TAILOPTS}${STARTLINE} > ${FILE}
 	fi;
@@ -160,8 +160,8 @@ if [ $? -eq 0 ]; then
 			STARTLINE=`grep ${GREPOPTS} "^more <<\"EOF\"$" jre.bin`
 			STARTLINE=${STARTLINE%%:*}
 			# Location of license end
-			ENDLINE=`grep ${GREPOPTS} "If you don't agree to the license you can't install this software" jre.bin`
-			ENDLINE=$((${ENDLINE%%:*} + 3))
+			ENDLINE=`grep ${GREPOPTS} "Do you agree to the above license terms?" jre.bin`
+			ENDLINE=$((${ENDLINE%%:*} - 4))
 			# Location of checksum start
 			CSSTARTLINE=`grep ${GREPOPTS} "^if \[ -x /usr/bin/sum \]; then$" jre.bin`
 			CSSTARTLINE=${CSSTARTLINE%%:*}

installer/linux/progressbar.sh

@@ -117,9 +117,9 @@ readprogress() {
 			if [ "${KDETYPE}" = "dcop" ]; then
 				wasCancelled=`${DCOP} ${progresswindow} wasCancelled`;
 			elif [ "${KDETYPE}" = "qdbus" ]; then
-				wasCancelled=` ${QDBUS} ${progresswindow} org.kde.kdialog.ProgressDialog.wasCancelled`;
+				wasCancelled=`${QDBUS} ${progresswindow} org.kde.kdialog.ProgressDialog.wasCancelled`;
 			elif [ "${KDETYPE}" = "dbussend" ]; then
-				wasCancelled=` ${DBUSSEND} --print-reply --dest=${progresswindow} org.kde.kdialog.ProgressDialog.wasCancelled | grep boolean | awk '{print $2}'`;
+				wasCancelled=`${DBUSSEND} --print-reply --dest=${progresswindow} org.kde.kdialog.ProgressDialog.wasCancelled | grep boolean | awk '{print $2}'`;
 			fi
 			if [ "${wasCancelled}" = "true" ]; then
 				break;