Merge branch 'develop' into 'master'

Develop

See merge request prey/js/prey-node-client!1305

Author: Javier Acuna

bin/wpxsvc.exe

@@ -1,5 +1,4 @@
 // Prey Alert
-// Written by Tomas Pollak
 
 var join        = require('path').join,
     common      = require('./../../common'),
@@ -9,7 +8,7 @@ var join        = require('path').join,
     actions_app = join(__dirname, '..', '..', 'utils', 'prey-actions.app'),
     Emitter     = require('events').EventEmitter,
     is_win      = process.platform == 'win32',
-    is_linux     = process.platform == 'linux';
+    is_linux    = process.platform == 'linux';
 
 var child,
     emitter,
@@ -45,9 +44,19 @@ exports.start = function(id, opts, cb) {
     args.push('-m', message); // in windows, the bin expects a -m message argument
     args.push('-t', '');
     bin += '.exe';
+
   } else if (is_linux) {
-    args.push(message);
-    bin += ((system.python_version && system.python_version >= "3.0.0") ? '3.py' : '.py');
+    bin = "zenity";
+    args = ['--info', '--text=' + message];
+
+    system.get_env((err, env) => {
+      // Overwrite ENV variables for logged user
+      if (!err && env) {
+        process.env.DISPLAY = env.display;
+        process.env.XAUTHORITY = env.xauthority;
+      }
+    });
+
   } else {
     if (common.os_release >= '10.14') {
       app = prey_app;