Ver código fonte

Make linux uninstaller use -k like the windows one. (Issue 1728)


git-svn-id: http://svn.dmdirc.com/trunk@4628 00569f92-eb28-0410-84fd-f71c24880f
tags/0.6.3m1rc1
Shane Mc Cormack 16 anos atrás
pai
commit
1a978b1045
1 arquivos alterados com 2 adições e 2 exclusões
  1. 2
    2
      src/com/dmdirc/installer/LinuxInstaller.java

+ 2
- 2
src/com/dmdirc/installer/LinuxInstaller.java Ver arquivo

@@ -235,8 +235,8 @@ public class LinuxInstaller extends Installer {
235 235
 					writer.println("	exit 1;");
236 236
 					writer.println("fi");
237 237
 					
238
-					writer.println("RUNNING=`${JAVA} -jar " + location + "/DMDirc.jar -e -v 2>&1 1>/dev/null | grep 'Unable to connect'`");
239
-					writer.println("if [ -z \"${RUNNING}\" ]; then");
238
+					writer.println("${JAVA} -jar " + location + "/DMDirc.jar -k");
239
+					writer.println("if [ $? -eq 0 ]; then");
240 240
 					writer.println("	errordialog \"Uninstaller\" \"Uninstall Aborted - DMDirc is still running.\nPlease close DMDirc before continuing\"");
241 241
 					writer.println("	echo \"Uninstall Aborted - DMDirc already running.\"");
242 242
 					writer.println("	exit 1;");

Carregando…
Cancelar
Salvar