From 1e11485bf4686e9cf12b82541aec9761d573f1ed Mon Sep 17 00:00:00 2001
From: Joran Dirk Greef <joran@ronomon.com>
Date: Sat, 4 Jun 2016 13:17:14 +0200
Subject: [PATCH] Remove support for gksudo (gksudo breaks when used
 concurrently)

---
 index.js           | 15 +++++----------
 test-concurrent.js | 23 +++++++++++++++++++++++
 2 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 test-concurrent.js

diff --git a/index.js b/index.js
index 52981fa..eb7a9ca 100644
--- a/index.js
+++ b/index.js
@@ -113,13 +113,7 @@ function Linux(instance, end) {
       if (error) return end(error);
       var command = [];
       command.push('"' + EscapeDoubleQuotes(binary) + '"');
-      if (/gksudo/i.test(binary)) {
-        command.push('--preserve-env');
-        command.push('--sudo-mode');
-        var description = EscapeDoubleQuotes(instance.options.name);
-        command.push('--description="' + description + '"');
-        command.push('--');
-      } else if (/kdesudo/i.test(binary)) {
+      if (/kdesudo/i.test(binary)) {
         command.push('--');
       } else if (/pkexec/i.test(binary)) {
         command.push('--disable-internal-agent');
@@ -140,11 +134,12 @@ function Linux(instance, end) {
 
 function LinuxBinary(instance, end) {
   var index = 0;
-  // We prefer gksudo over pkexec since it enables a better prompt:
-  var paths = ['/usr/bin/gksudo', '/usr/bin/pkexec', '/usr/bin/kdesudo'];
+  // We used to prefer gksudo over pkexec since it enabled a better prompt.
+  // However, gksudo cannot run multiple commands concurrently.
+  var paths = ['/usr/bin/pkexec', '/usr/bin/kdesudo'];
   function test() {
     if (index === paths.length) {
-      return end(new Error('Unable to find gksudo, pkexec or kdesudo.'));
+      return end(new Error('Unable to find pkexec or kdesudo.'));
     }
     var path = paths[index++];
     Node.fs.stat(path,
diff --git a/test-concurrent.js b/test-concurrent.js
new file mode 100644
index 0000000..09977a3
--- /dev/null
+++ b/test-concurrent.js
@@ -0,0 +1,23 @@
+var sudo = require('./');
+var exec = require('child_process').exec;
+
+function kill(end) {
+  exec('sudo -k', end);
+}
+kill(
+  function() {
+    var options = {
+      name: 'Sudo Prompt'
+    };
+    sudo.exec('sleep 10 && echo world', options,
+      function(error, stdout, stderr) {
+        console.log(error, stdout, stderr);
+      }
+    );
+    sudo.exec('echo hello', options,
+      function(error, stdout, stderr) {
+        console.log(error, stdout, stderr);
+      }
+    );
+  }
+);