Added irc:// handler support to Linux installers

Linux scripts now use kdialog/zenity where appropriate to show error messages. No longer expect users to have a terminal open


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

installer/linux/makeInstallerLinux.sh

@@ -273,12 +273,35 @@ fi
 
 ###ADDITIONAL_STUFF###
 
+errordialog() {
+	# Send message to console.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "Error: ${1}"
+	echo "-----------------------------------------------------------------------"
+	echo "${2}"
+	echo "-----------------------------------------------------------------------"
+
+	# Now try to use the GUI Dialogs.
+	ISKDE=`pidof -x -s kdeinit`
+	KDIALOG=`which kdialog`
+	ISGNOME=`pidof -x -s gnome-panel`
+	ZENITY=`which zenity`
+	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
+}
+
 # Location of .run stub end
 ENDLINE=`grep -na "^###END INCLUDE###$" $0`
 ENDLINE=$((${ENDLINE%%:*} + 1))
 
 if [ "" = "${ENDLINE}" ]; then
-	echo "End of stub not found. Aborting.";
+	errordialog "DMDirc Setup" "End of stub not found. Aborting.";
 	exit 0;
 fi
 
@@ -330,7 +353,7 @@ random() {
 				DIR=${BASEDIR}${RND}
 				if [ -e "${DIR}" ]; then
 					# Lets hope this never happens.
-					echo "Unable to create random directory";
+					errordialog "DMDirc Setup" "Unable to create random directory";
 					exit 0;
 				fi;
 			fi;
@@ -410,11 +433,9 @@ if [ "${MD5BIN}" != "" ]; then
 			if [ $? = 0 ]; then
 				echo "MD5 Check Passed!"
 			else
-				echo ""
-				echo "MD5 Check Failed!"
-				echo "--------------------------"
-				echo "This copy of the DMDirc installer appears to be damaged and will now exit.";
-				echo "You may choose to skip this check and run it anyway by passing the --nomd5 parameter";
+				ERROR="This copy of the DMDirc installer appears to be damaged and will now exit.";
+				ERROR=${ERROR}"\nYou may choose to skip this check and run it anyway by passing the --nomd5 parameter";
+				errordialog "DMDirc Setup: MD5 Check Failed!" "${ERROR}";
 				exit 1;
 			fi
 		elif [ "${MD5}" != ""  ]; then
@@ -428,11 +449,9 @@ if [ "${MD5BIN}" != "" ]; then
 				if [ "${MD5SUM}" = "${MD5}" ]; then
 					echo "MD5 Check Passed!"
 				else
-					echo ""
-					echo "MD5 Check Failed!"
-					echo "--------------------------"
-					echo "This copy of the DMDirc installer appears to be damaged and will now exit.";
-					echo "You may choose to skip this check and run it anyway by passing the --nomd5 parameter";
+					ERROR="This copy of the DMDirc installer appears to be damaged and will now exit.";
+					ERROR=${ERROR}"\nYou may choose to skip this check and run it anyway by passing the --nomd5 parameter";
+					errordialog "DMDirc Setup: MD5 Check Failed!" "${ERROR}";
 					exit 1;
 				fi;
 			else

installer/linux/setup.sh

@@ -23,6 +23,29 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+errordialog() {
+	# Send message to console.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "Error: ${1}"
+	echo "-----------------------------------------------------------------------"
+	echo "${2}"
+	echo "-----------------------------------------------------------------------"
+
+	# Now try to use the GUI Dialogs.
+	ISKDE=`pidof -x -s kdeinit`
+	KDIALOG=`which kdialog`
+	ISGNOME=`pidof -x -s gnome-panel`
+	ZENITY=`which zenity`
+	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
+}
+
 echo ""
 echo "---------------------"
 echo "Setup.sh"
@@ -35,15 +58,11 @@ if [ "" != "${JAVA}" ]; then
 else
 	echo "Failed!"
 	# This should in future offer to download and install the JVM automatically.
-	echo ""
-	echo "-----------------------------------------------------------------------"
-	echo "Unable to complete setup!"
-	echo "-----------------------------------------------------------------------"
-	echo "Sorry, java is not installed on this machine."
-	echo ""
-	echo "DMDirc requires a 1.6.0 compatible JVM, you can get one from:"
-	echo "http://jdl.sun.com/webapps/getjava/BrowserRedirect"
-	echo "-----------------------------------------------------------------------"
+	ERROR="Sorry, java is not installed on this machine.";
+	ERROR=${ERROR}"\n"
+	ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from:";
+	ERROR=${ERROR}"\nhttp://jdl.sun.com/webapps/getjava/BrowserRedirect";
+	errordialog "Unable to complete setup!" "${ERROR}";
 	exit 1;
 fi
 
@@ -102,21 +121,17 @@ if [ -e "installer.jar" ]; then
 		echo "Running installer.."
 		${JAVA} -cp DMDirc.jar -jar installer.jar ${isRoot}${isRelease}
 		if [ $? -ne 0 ]; then
-			echo ""
-			echo "-----------------------------------------------------------------------"
-			echo "Unable to complete setup!"
-			echo "-----------------------------------------------------------------------"
-			echo "Sorry, the currently installed version of java is not compatible with"
-			echo "DMDirc."
-			echo ""
-			echo "DMDirc requires a 1.6.0 compatible JVM, you can get one from:"
-			echo "http://jdl.sun.com/webapps/getjava/BrowserRedirect"
-			echo "-----------------------------------------------------------------------"
+			ERROR="Sorry, the currently installed version of java is not compatible with";
+			ERROR=${ERROR}"\nDMDirc.";
+			ERROR=${ERROR}"\n";
+			ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from:";
+			ERROR=${ERROR}"\nhttp://jdl.sun.com/webapps/getjava/BrowserRedirect";
+			errordialog "Unable to complete setup!" "${ERROR}";
 			exit 1;
 		fi
 		exit 0;
 	fi
-else 
+else
 	echo "No installer found!"
 fi
 

launcher/linux/DMDirc.sh

@@ -37,6 +37,29 @@ while test -n "$1"; do
 	shift
 done
 
+errordialog() {
+	# Send message to console.
+	echo ""
+	echo "-----------------------------------------------------------------------"
+	echo "Error: ${1}"
+	echo "-----------------------------------------------------------------------"
+	echo "${2}"
+	echo "-----------------------------------------------------------------------"
+
+	# Now try to use the GUI Dialogs.
+	ISKDE=`pidof -x -s kdeinit`
+	KDIALOG=`which kdialog`
+	ISGNOME=`pidof -x -s gnome-panel`
+	ZENITY=`which zenity`
+	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
+}
+
 jar=`dirname $0`/DMDirc.jar
 
 echo "---------------------"
@@ -65,15 +88,11 @@ if [ "" != "${JAVA}" ]; then
 else
 	echo "Failed!"
 	# This should in future offer to download and install the JVM automatically.
-	echo ""
-	echo "-----------------------------------------------------------------------"
-	echo "Unable to launch dmdirc!"
-	echo "-----------------------------------------------------------------------"
-	echo "Sorry, java is not installed on this machine."
-	echo ""
-	echo "DMDirc requires a 1.6.0 compatible JVM, you can get one from:"
-	echo "http://jdl.sun.com/webapps/getjava/BrowserRedirect"
-	echo "-----------------------------------------------------------------------"
+	ERROR="Sorry, java is not installed on this machine.";
+	ERROR=${ERROR}"\n"
+	ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from:";
+	ERROR=${ERROR}"\nhttp://jdl.sun.com/webapps/getjava/BrowserRedirect";
+	errordialog "Unable to launch dmdirc!" "${ERROR}";
 	exit 1;
 fi
 
@@ -85,16 +104,12 @@ if [ -e "${jar}" ]; then
 	${JAVA} -jar ${jar} --help >/dev/null 2>&1
 	if [ $? -ne 0 ]; then
 		echo "Failed."
-		echo ""
-		echo "-----------------------------------------------------------------------"
-		echo "Unable to launch DMDirc!"
-		echo "-----------------------------------------------------------------------"
-		echo "Sorry, the currently installed version of java is not compatible with"
-		echo "DMDirc."
-		echo ""
-		echo "DMDirc requires a 1.6.0 compatible JVM, you can get one from:"
-		echo "http://jdl.sun.com/webapps/getjava/BrowserRedirect"
-		echo "-----------------------------------------------------------------------"
+		ERROR="Sorry, the currently installed version of java is not compatible with";
+		ERROR=${ERROR}"\nDMDirc.";
+		ERROR=${ERROR}"\n";
+		ERROR=${ERROR}"\nDMDirc requires a 1.6.0 compatible JVM, you can get one from:";
+		ERROR=${ERROR}"\nhttp://jdl.sun.com/webapps/getjava/BrowserRedirect";
+		errordialog "Unable to launch dmdirc!" "${ERROR}";
 		exit 1;
 	fi
 	
@@ -103,5 +118,6 @@ if [ -e "${jar}" ]; then
 	${JAVA} -jar ${jar} ${params}
 	exit $?;
 else 
-	echo "Failed: No jar file found!"
+	echo "Failed.";
+	errordialog "Unable to launch dmdirc!" "No jar file found";
 fi

src/com/dmdirc/installer/Installer.java

@@ -146,4 +146,12 @@ public abstract class Installer extends Thread {
 			throw new IOException(srcFile+" does not exist.");
 		}
 	}
+	
+	
+	/**
+	 * Any post-install tasks should be done here.
+	 *
+	 * @param location Location where app was installed to.
+	 */
+	public void postInstall(final String location) { }
 }

src/com/dmdirc/installer/LinuxInstaller.java

@@ -69,9 +69,10 @@ public class LinuxInstaller extends Installer {
 			case DESKTOP:
 				// No desktop for root
 				return !isRoot();
+			case PROTOCOL:
 			case UNINSTALLER:
 			case MENU:
-				// Both root and non-root have a menu and uninstaller
+				// Both root and non-root have a menu, uninstaller, and protocol
 				return true;
 			default:
 				// Anything else that gets added should be false until the relevent
@@ -94,7 +95,8 @@ public class LinuxInstaller extends Installer {
 		
 		PrintWriter writer = null;
 		try {
-			String filename;
+			String filename = "";
+			String command = "";
 
 			switch (shortcutType) {
 				case DESKTOP:
@@ -102,7 +104,7 @@ public class LinuxInstaller extends Installer {
 					break;
 					
 				case MENU:
-					if (CLIParser.getCLIParser().getParamNumber("-isroot") > 0) {
+					if (isRoot()) {
 						filename = "/usr/share/applications/DMDirc.desktop";
 					} else {
 						filename = System.getProperty("user.home")+"/.local/share/applications/DMDirc.desktop";
@@ -112,20 +114,144 @@ public class LinuxInstaller extends Installer {
 				case UNINSTALLER:
 					writer = new PrintWriter(location+"/uninstall.sh");
 					writer.println("#!/bin/sh");
+					writer.println("# DMDirc Uninstaller");
+					writer.println("ISKDE=`pidof -x -s kdeinit`");
+					writer.println("KDIALOG=`which kdialog`");
+					writer.println("ISGNOME=`pidof -x -s gnome-panel`");
+					writer.println("ZENITY=`which zenity`");
+					writer.println("DIALOG=`which dialog`");
+					
+					if (isRoot()) {
+						writer.println("USER=`whoami`");
+						writer.println("if [ \"${USER}\" != \"root\" ]; then");
+						writer.println("if [ ${result} -eq 1 ]; then");
+						writer.println("\t\tif [ \"\" != \"${ISKDE}\" -a \"\" != \"${KDIALOG}\" -a \"\" != \"${DISPLAY}\" ]; then");
+						writer.println("\t\t	${KDIALOG} --title \"DMDirc Uninstaller\" --error \"Uninstall Aborted. Only root can use this script\"");
+						writer.println("\t\telif [ \"\" != \"${ISGNOME}\" -a \"\" != \"${ZENITY}\" -a \"\" != \"${DISPLAY}\" ]; then");
+						writer.println("\t\t	${ZENITY} --info --title \"DMDirc Uninstaller\" --text \"Uninstall Aborted. Only root can use this script\"");
+						writer.println("\t\tfi");
+						writer.println("\t\techo \"Uninstall Aborted. Only root can use this script\"");
+						writer.println("\tfi");
+						writer.println("exit 1;");
+						writer.println("fi");
+					}
+					
+					writer.println("if [ \"\" != \"${ISKDE}\" -a \"\" != \"${KDIALOG}\" -a \"\" != \"${DISPLAY}\" ]; then");
+					writer.println("	echo \"Dialog Prompt on: ${DISPLAY}\"");
+					writer.println("	${KDIALOG} --title \"DMDirc Uninstaller\" --yesno \"Are you sure you want to uninstall DMDirc?\"");
+					writer.println("elif [ \"\" != \"${ISGNOME}\" -a \"\" != \"${ZENITY}\" -a \"\" != \"${DISPLAY}\" ]; then");
+					writer.println("	echo \"Dialog Prompt on: ${DISPLAY}\"");
+					writer.println("	${ZENITY} --question --title \"DMDirc Uninstaller\" --text \"Are you sure you want to uninstall DMDirc?\"");
+					writer.println("elif [ \"\" != \"${DIALOG}\" ]; then");
+					writer.println("	${DIALOG} --title \"DMDirc Uninstaller\" --yesno \"Are you sure you want to uninstall DMDirc?\" 8 40");
+					writer.println("fi");
+					
+					writer.println("if [ $? -ne 0 ]; then");
+					writer.println("\tif [ \"\" != \"${ISKDE}\" -a \"\" != \"${KDIALOG}\" -a \"\" != \"${DISPLAY}\" ]; then");
+					writer.println("\t	${KDIALOG} --title \"DMDirc Uninstaller\" --msgbox \"Uninstall Aborted\"");
+					writer.println("\telif [ \"\" != \"${ISGNOME}\" -a \"\" != \"${ZENITY}\" -a \"\" != \"${DISPLAY}\" ]; then");
+					writer.println("\t	${ZENITY} --info --title \"DMDirc Uninstaller\" --text \"Uninstall Aborted\"");
+					writer.println("\tfi");
+					writer.println("\techo \"Uninstall Aborted\"");
+					writer.println("\texit 1;");
+					writer.println("fi");
+					
 					writer.println("echo \"Uninstalling dmdirc\"");
 					writer.println("echo \"Removing Shortcuts..\"");
-					if (CLIParser.getCLIParser().getParamNumber("-isroot") > 0) {
+					if (isRoot()) {
+						command = "${TOOL} --config-source=`${TOOL} --get-default-source`";
+						filename = "/usr/share/services/irc.protocol";
 						writer.println("rm -Rfv /usr/share/applications/DMDirc.desktop");
 					} else {
+						command = "${TOOL}";
+						filename = "~/.kde/share/services/irc.protocol";
 						writer.println("rm -Rfv "+System.getProperty("user.home")+"/.local/share/applications/DMDirc.desktop");
 						writer.println("rm -Rfv "+System.getProperty("user.home")+"/Desktop/DMDirc.desktop");
 					}
+					writer.println("TOOL=`which gconftool-2`");
+					writer.println("if [ \"${TOOL}\" != \"\" ]; then");
+					writer.println("\tCURRENT=`"+command+" --get /desktop/gnome/url-handlers/irc/command`");
+					writer.println("\tif [ \"${CURRENT}\" = \"\\\""+location+"/DMDirc.sh\\\" -c %s\" ]; then");
+					writer.println("\t\techo \"Removing Gnome Protocol Handler\"");
+					writer.println("\t\t"+command+" --unset /desktop/gnome/url-handlers/irc/enabled");
+					writer.println("\t\t"+command+" --unset /desktop/gnome/url-handlers/irc/command");
+					writer.println("\telse");
+					writer.println("\t\techo \"Not Removing Gnome Protocol Handler\"");
+					writer.println("\tfi");
+					writer.println("fi");
+					
+					writer.println("if [ -e \""+filename+"\" ]; then");
+					writer.println("\tCURRENT=`grep DMDirc "+filename+"`");
+					writer.println("\tif [ \"\" != \"${CURRENT}\" ]; then");
+					writer.println("\t\techo \"Removing KDE Protocol Handler\"");
+					writer.println("\t\trm -Rfv "+filename);
+					writer.println("\telse");
+					writer.println("\t\techo \"Not Removing KDE Protocol Handler\"");
+					writer.println("\tfi");
+					writer.println("fi");
+					
 					writer.println("echo \"Removing Installation Directory\"");
-					writer.println("rm -Rfv "+location);
+					writer.println("rm -Rfv \""+location+"\"");
+
+					writer.println("if [ \"\" != \"${ISKDE}\" -a \"\" != \"${KDIALOG}\" -a \"\" != \"${DISPLAY}\" ]; then");
+					writer.println("	${KDIALOG} --title \"DMDirc Uninstaller\" --msgbox \"DMDirc Uninstalled Successfully\"");
+					writer.println("elif [ \"\" != \"${ISGNOME}\" -a \"\" != \"${ZENITY}\" -a \"\" != \"${DISPLAY}\" ]; then");
+					writer.println("	${ZENITY} --info --title \"DMDirc Uninstaller\" --text \"DMDirc Uninstalled Successfully\"");
+					writer.println("fi");
+					
 					writer.println("echo \"Done.\"");
 					
 					(new File(location+"/uninstall.sh")).setExecutable(true);
 					return;
+				
+				case PROTOCOL:
+					if (isRoot()) {
+						command = "${TOOL} --config-source=`${TOOL} --get-default-source`";
+						filename = "/usr/share/services/";
+					} else {
+						command = "${TOOL}";
+						filename = "~/.kde/share/services/";
+					}
+					
+					writer = new PrintWriter(location+"/protocolHandlers.sh");
+					writer.println("#!/bin/sh");
+					writer.println("TOOL=`which gconftool-2`");
+					writer.println("if [ \"${TOOL}\" != \"\" ]; then");
+					writer.println("\t"+command+" --set --type=bool /desktop/gnome/url-handlers/irc/enabled true");
+					writer.println("\t"+command+" --set --type=string /desktop/gnome/url-handlers/irc/command \"\\\""+location+"/DMDirc.sh\\\" -c %s\"");
+					writer.println("fi");
+					writer.println("exit 0;");
+					writer.close();
+					
+					(new File(location+"/protocolHandlers.sh")).setExecutable(true);
+					
+					try {
+						final Process gconfProcess = Runtime.getRuntime().exec(new String[]{"/bin/sh", location+"/protocolHandlers.sh"});
+						new StreamReader(gconfProcess.getInputStream()).start();
+						new StreamReader(gconfProcess.getErrorStream()).start();
+						gconfProcess.waitFor();
+						(new File(location+"/protocolHandlers.sh")).delete();
+					} catch (Exception e) {
+						step.addText(" - Error adding gnome Protocol Handler: "+e.getMessage());
+					}
+					
+					if (filename != "") {
+						if ((new File(filename)).exists()) {
+							writer = new PrintWriter(filename+"irc.protocol");
+							writer.println("[Protocol]");
+							writer.println("Exec="+location+"/DMDirc.sh -c %u");
+							writer.println("protocol=irc");
+							writer.println("input=none");
+							writer.println("output=none");
+							writer.println("helper=true");
+							writer.println("listing=false");
+							writer.println("reading=false");
+							writer.println("writing=false");
+							writer.println("makedir=false");
+							writer.println("deleting=false");
+						}
+					}
+					return;
 					
 				default:
 					step.addText(" - Error creating shortcut. Not applicable to this Operating System");
@@ -168,4 +294,13 @@ public class LinuxInstaller extends Installer {
 		writer.println("TerminalOptions=");
 		writer.println("Type=Application");
 	}
+	
+	/**
+	 * Any post-install tasks should be done here.
+	 *
+	 * @param location Location where app was installed to.
+	 */
+	public void postInstall(final String location) {
+		(new File(location+"/DMDirc.sh")).setExecutable(true);
+	}
 }

src/com/dmdirc/installer/StepInstall.java

@@ -137,6 +137,8 @@ public final class StepInstall extends Step implements StepListener {
 			}
 		}
 		
+		myInstaller.postInstall(location);
+		
 		addText("");
 		addText("Installation finished\n");
 		Main.getWizardDialog().enableNextStep(true);