Merge pull request #546 from prey/Fix-ubuntu-installation

fix ubuntu installation

lib/agent/plugins/control-panel/secure.js

@@ -126,14 +126,19 @@ exports.open_config = function(device_key, cb) {
       else if (os_name == 'mac')
         return run_as_user('open', [link], cb);
       // Open the logged user's default browser, the prey user doesn't have one
-
       // For linux
-      system.spawn_as_logged_user('xdg-open', [link], {env: {DISPLAY: process.env.DISPLAY}}, (err, child) => {
-        setTimeout(() => {
-          child.kill();
-        }, 10000);
-        return cb() && cb(err);
+      cb();
+      system.get_logged_user((error, logged_user) => {
+        if(error) return;
+        exec(`sudo -u ${logged_user} ${common.root_path}/openwebbrowser.sh ${link} &`,
+        {
+          timeout: 200
+        }, (err, stderr, stdout) => {
+          if(err || stderr) return;
+          process.exit();
+        });
       });
+      return;
     });
   }, 3000);
 }
@@ -149,7 +154,7 @@ exports.reset_keys = function(cb) {
   })
 }
 
-exports.decrypt_and_notify = function(encrypted_key, cb) {
+exports.decrypt_and_notify = function(encrypted_key, cb) {
   var decrypted_key;
 
   try {
@@ -176,4 +181,4 @@ exports.decrypt_and_notify = function(encrypted_key, cb) {
 
 exports.public_keys = function() { return public_keys; };
 exports.notify_linked = notify_linked;
-exports.notify_error  = notify_error;
+exports.notify_error  = notify_error;

openwebbrowser.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+webbrowser=`xdg-settings get default-web-browser`
+if [ "$webbrowser" == "firefox.desktop" ]; then
+    firefox -CreateProfile Prey
+    firefox -P Prey -url $1
+else
+    xdg-open $1
+fi