Fixes issue 1479 again.

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

installer/linux/installerstub.sh

@@ -390,7 +390,7 @@ if [ -e "${TEMPDIR}/setup.sh" ]; then
 	if [ $? -eq 0 ]; then
 		echo "Setup completed."
 	else
-		echo "Setup failed."
+		echo "Setup did not complete."
 	fi
 else
 	echo "No setup.sh found. This was pointless?"

installer/linux/setup.sh

@@ -167,20 +167,14 @@ showHelp() {
 	echo "---------------------"
 	echo "-h, --help                Help information"
 	echo "-r, --release [version]   This is a release"
-#	echo "-s, --script              Don't use installer.jar (not implemented yet)"
 	echo "---------------------"
 	exit 0;
 }
 
 # Check for some CLI params
-scriptOnly="false"
 isRelease=""
 while test -n "$1"; do
 	case "$1" in
-		--script|-s)
-			scriptOnly="true"
-			shift
-			;;
 		--release|-r)
 			shift
 			isRelease=${1}
@@ -197,23 +191,19 @@ if [ "${isRelease}" != "" ]; then
 fi
 
 if [ -e "DMDirc.jar" ]; then
-	if [ "${scriptOnly}" = "true" ]; then
-		echo "Script-only install requested."
-	else
-		echo "Checking java version.."
-		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main --help >/dev/null
+	echo "Checking java version.."
+	${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main --help >/dev/null
+	if [ $? -ne 0 ]; then
+		installjre "upgrade"
+		echo "Trying to run installer.."
+		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
 		if [ $? -ne 0 ]; then
-			installjre "upgrade"
-			echo "Trying to run installer.."
-			${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
-			if [ $? -ne 0 ]; then
-				exit 1;
-			fi;
-		else
-			echo "Running installer.."
-			${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
-		fi
-		exit 0;
+			exit 1;
+		fi;
+	else
+		echo "Running installer.."
+		${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
+		exit $?
 	fi
 else
 	echo "No installer found!"

installer/windows/Setup.dpr

@@ -406,6 +406,7 @@ var
 	params: String = '';
 	dir: String = '';
 	Reg: TRegistry;
+	result: Integer;
 begin
 	{$IFDEF LAZARUS}
 		Application.Initialize;
@@ -469,14 +470,16 @@ begin
 			end
 			else begin
 				// Try again now that java is installed.
-				ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
+				result := ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
 			end;
 		end
 		else begin
 			// Java is the right version, run the installer
-			ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
+			result := ExecAndWait(javaCommand+' -cp DMDirc.jar com.dmdirc.installer.Main '+params);
 		end;
-end
+		if result = 0 then dowriteln('Installation completed.')
+		else dowriteln('Installation did not complete.')
+	end
 	else begin
 		dowriteln('Failed!');
 		errorMessage := errorMessage+'DMDirc.jar was not found.';