[dmdirc commit] r5825 - trunk/src/com/dmdirc/installer

[com...@dmdirc.com]

Author: ShaneMcC
Date: 2010-01-24 14:20:05 +0000 (Sun, 24 Jan 2010)
New Revision: 5825

Modified:
trunk/src/com/dmdirc/installer/LinuxInstaller.java
Log:
Make .desktop files executeable. Fixes issue 3565 (http://bugs.dmdirc.com/view/3565)

Git-version: 0.6.3m2-361-g194ad95

Modified: trunk/src/com/dmdirc/installer/LinuxInstaller.java
===================================================================
--- trunk/src/com/dmdirc/installer/LinuxInstaller.java 2010-01-24 03:57:04 UTC (rev 5824)
+++ trunk/src/com/dmdirc/installer/LinuxInstaller.java 2010-01-24 14:20:05 UTC (rev 5825)
@@ -145,19 +145,21 @@
writer.println("\t"+command+" --set --type=string /desktop/gnome/url-handlers/irc/command \"\\\""+location+"/DMDirc.sh\\\" -e -c %s\"");
writer.println("\t"+command+" --set --type=bool /desktop/gnome/url-handlers/irc/need-terminal false");
writer.println("fi");
- writer.println("if [ -e \""+filename+"\" ]; then");
- writer.println("\techo \"[Protocol]\" > "+filename+"irc.protocol");
- writer.println("\techo \"exec=\""+location+"/DMDirc.sh\" -e -c %u\" >> "+filename+"irc.protocol");
- writer.println("\techo \"protocol=irc\" >> "+filename+"irc.protocol");
- writer.println("\techo \"input=none\" >> "+filename+"irc.protocol");
- writer.println("\techo \"output=none\" >> "+filename+"irc.protocol");
- writer.println("\techo \"helper=true\" >> "+filename+"irc.protocol");
- writer.println("\techo \"listing=false\" >> "+filename+"irc.protocol");
- writer.println("\techo \"reading=false\" >> "+filename+"irc.protocol");
- writer.println("\techo \"writing=false\" >> "+filename+"irc.protocol");
- writer.println("\techo \"makedir=false\" >> "+filename+"irc.protocol");
- writer.println("\techo \"deleting=false\" >> "+filename+"irc.protocol");
- writer.println("fi");
+ writer.println("if [ ! -e \""+filename+"\" ]; then");
+ writer.println("\tmkdir -p \""+filename+"\"");
+ writer.println("fi");
+ writer.println("echo \"[Protocol]\" > "+filename+"irc.protocol");
+ writer.println("echo \"exec=\""+location+"/DMDirc.sh\" -e -c %u\" >> "+filename+"irc.protocol");
+ writer.println("echo \"protocol=irc\" >> "+filename+"irc.protocol");
+ writer.println("echo \"input=none\" >> "+filename+"irc.protocol");
+ writer.println("echo \"output=none\" >> "+filename+"irc.protocol");
+ writer.println("echo \"helper=true\" >> "+filename+"irc.protocol");
+ writer.println("echo \"listing=false\" >> "+filename+"irc.protocol");
+ writer.println("echo \"reading=false\" >> "+filename+"irc.protocol");
+ writer.println("echo \"writing=false\" >> "+filename+"irc.protocol");
+ writer.println("echo \"makedir=false\" >> "+filename+"irc.protocol");
+ writer.println("echo \"deleting=false\" >> "+filename+"irc.protocol");
+ writer.println("chmod a+x "+filename+"irc.protocol");
writer.println("exit 0;");
writer.close();

@@ -183,12 +185,14 @@
step.addText(" - Error creating shortcut. Not applicable to this Operating System");
return;
}
- File temp = new File(filename);
- if (!temp.getParentFile().exists()) {
- temp.getParentFile().mkdir();
+ final File outFile = new File(filename);
+ if (!outFile.getParentFile().exists()) {
+ outFile.getParentFile().mkdir();
}
- writer = new PrintWriter(filename);
+ writer = new PrintWriter(outFile);
writeFile(writer, location);
+
+ outFile.setExecutable(true);
} catch (IOException e) {
step.addText(" - Error creating shortcut: "+e.toString());
} catch (SecurityException e) {