From 5eb4cdefb759fdc1664243262600d15b86ffde94 Mon Sep 17 00:00:00 2001
From: AJ ONeal <coolaj86@gmail.com>
Date: Wed, 27 Jun 2018 04:24:56 -0600
Subject: [PATCH] node-based install launcher tested on macOS

---
 bin/telebitd.js                               |   1 +
 .../cloud.telebit.remote.plist.tpl            |   4 +-
 .../cloud.telebit.remote.plist.tpl            |   4 +-
 usr/share/install-launcher.js                 | 105 +++++++++++-------
 usr/share/install_helper.sh                   |   2 +
 usr/share/template-launcher.js                |  14 ++-
 6 files changed, 81 insertions(+), 49 deletions(-)

diff --git a/bin/telebitd.js b/bin/telebitd.js
index ec7406f..d2b5910 100755
--- a/bin/telebitd.js
+++ b/bin/telebitd.js
@@ -408,6 +408,7 @@ function serveControlsHelper() {
   // mask is so that processes owned by other users
   // can speak to this process, which is probably root-owned
   var oldUmask = process.umask(0x0000);
+  require('mkdirp').sync(path.resolve(state._ipc.path, '..'));
   controlServer.listen({
     path: state._ipc.path
   , writableAll: true
diff --git a/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist.tpl b/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist.tpl
index a455b8f..513db78 100644
--- a/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist.tpl
+++ b/usr/share/dist/Library/LaunchDaemons/cloud.telebit.remote.plist.tpl
@@ -17,9 +17,9 @@
 		<key>TELEBIT_PATH</key>
 		<string>{TELEBIT_PATH}</string>
 		<key>NODE_PATH</key>
-		<string>{TELEBIT_PATH}/lib/node_modules</string>
+		<string>{NODE_PATH}</string>
 		<key>NPM_CONFIG_PREFIX</key>
-		<string>{TELEBIT_PATH}</string>
+		<string>{NPM_CONFIG_PREFIX}</string>
 	</dict>
 
 	<key>UserName</key>
diff --git a/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl b/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl
index 5438d57..cca30d3 100644
--- a/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl
+++ b/usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl
@@ -19,9 +19,9 @@
 		<key>TELEBIT_PATH</key>
 		<string>{TELEBIT_PATH}</string>
 		<key>NODE_PATH</key>
-		<string>{TELEBIT_PATH}/lib/node_modules</string>
+		<string>{NODE_PATH}</string>
 		<key>NPM_CONFIG_PREFIX</key>
-		<string>{TELEBIT_PATH}</string>
+		<string>{NPM_CONFIG_PREFIX}</string>
 	</dict>
 
 	<!--
diff --git a/usr/share/install-launcher.js b/usr/share/install-launcher.js
index 2ebc920..b74a73d 100644
--- a/usr/share/install-launcher.js
+++ b/usr/share/install-launcher.js
@@ -10,7 +10,7 @@ module.exports.install = function (things) {
   things = things || {};
   // in some future version we can take this file out
   // and accept process.env from things
-  var installLauncher = require('./install-launcher');
+  var installLauncher = require('./template-launcher');
 
   // Right now this is just for npm install -g and npx
   if (things.env) {
@@ -19,7 +19,7 @@ module.exports.install = function (things) {
   var execOpts = { windowsHide: true, env: things.env || process.env };
   var userspace = (!things.telebitUser || (things.telebitUser === os.userInfo().username)) ? true : false;
   var telebitRoot = path.join(__dirname, '../..');
-  var telebitBinTpl = path.join(telebitRoot, 'dist/bin/telebit.tpl');
+  var telebitBinTpl = path.join(telebitRoot, 'usr/share/dist/bin/telebit.tpl');
   var vars = {
     telebitPath: telebitRoot
   , telebitUser: os.userInfo().username
@@ -28,54 +28,62 @@ module.exports.install = function (things) {
       path.resolve(__dirname, '../..')
     , path.join(os.homedir(), '.config/telebit')
     , path.join(os.homedir(), '.local/share/telebit')
-    ].join(' ')
-  , telebitNode: path.join(telebitRoot, 'bin/node')
-  , telebitNpm: path.join(telebitRoot, 'bin/npm')
+    ]
+  , telebitNode: (process.argv[0]||'').replace(/\.exe/i, '') // path.join(telebitRoot, 'bin/node')
   , telebitBin: path.join(telebitRoot, 'bin/telebit')
   , telebitdBin: path.join(telebitRoot, 'bin/telebitd')
-  , telebitBinJs: path.join(telebitRoot, 'bin/telebit.js')
-  , telebitdBinJs: path.join(telebitRoot, 'bin/telebitd.js')
+  , telebitJs: path.join(telebitRoot, 'bin/telebit.js')
+  , telebitdJs: path.join(telebitRoot, 'bin/telebitd.js')
   , telebitConfig: path.join(os.homedir(), '.config/telebit/telebit.yml')
   , telebitdConfig: path.join(os.homedir(), '.config/telebit/telebitd.yml')
   };
+  vars.telebitNpm = path.resolve(vars.telebitNode, '../npm');
+  vars.nodePath = path.resolve(vars.telebitNode, '../lib/node_modules');
+  vars.npmConfigPrefix = path.resolve(vars.telebitNode, '..');
+  if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
+    vars.telebitRwDirs.push(vars.npmConfigPrefix);
+  }
+  vars.telebitRwDirs = vars.telebitRwDirs.join(' ');
   var launchers = {
     'launchctl': function () {
       var launcher = path.join(os.homedir(), 'Library/LaunchAgents/cloud.telebit.remote.plist');
       try {
         mkdirp.sync(path.join(os.homedir(), 'Library/LaunchAgents'));
         mkdirp.sync(path.join(telebitRoot, 'bin'));
-        installLauncher({
+        installLauncher.sync({
           file: {
             tpl: telebitBinTpl
           , launcher: path.join(telebitRoot, 'bin/telebit')
           }
         , vars: vars
-        }, function (err) {
+        });
+        installLauncher({
+          file: {
+            tpl: path.join(telebitRoot, 'usr/share/dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl')
+          , launcher: launcher
+          }
+        , vars: vars
+        });
+        var launcherstr = (userspace ? "" : "sudo ") + "launchctl ";
+        exec(launcherstr + "unload -w " + launcher, execOpts, function (err, stdout, stderr) {
           if (err) { console.error(err); }
-          installLauncher({
-            file: {
-              tpl: path.join(__dirname, 'dist/etc/skel/Library/LaunchAgents/cloud.telebit.remote.plist.tpl')
-            , launcher: launcher
-            }
-          , vars: vars
-          }, function (err) {
+				  console.log((stdout||'').trim());
+          if (stderr) {
+            console.error(stderr);
+          }
+          console.log('unload worked?');
+          exec(launcherstr + "load -w " + launcher, execOpts, function (err, stdout, stderr) {
             if (err) { console.error(err); }
-            var launcherstr = (userspace ? "sudo " : "") + "launchctl ";
-            exec(launcherstr + "unload -w " + launcher, execOpts, function (err, stdout, stderr) {
-              console.log(stdout);
-              if (stderr) {
-                console.error(stderr);
-              }
-              exec(launcherstr + "load -w " + launcher, execOpts, function (err, stdout, stderr) {
-                console.log(stdout);
-                if (stderr) {
-                  console.error(stderr);
-                }
-              });
-            });
+				    console.log((stdout||'').trim());
+            if (stderr) {
+              console.error(stderr);
+            }
+            console.log('load worked?');
           });
         });
       } catch(e) {
+        console.error("'" + launcher + "' error:");
+        console.error(e);
       }
     }
   , 'systemctl': function () {
@@ -84,26 +92,31 @@ module.exports.install = function (things) {
         mkdirp.sync(path.join(os.homedir(), '.config/systemd/user'));
         installLauncher({
           file: {
-            tpl: path.join(__dirname, 'dist/etc/skel/.config/systemd/user/telebit.service.tpl')
+            tpl: path.join(telebitRoot, 'usr/share/dist/etc/skel/.config/systemd/user/telebit.service.tpl')
           , launcher: launcher
           }
         , vars: vars
         }, function () {
-          var launcherstr = "systemctl " + (userspace ? "--user " : "");
+          var launcherstr = (userspace ? "" : "sudo ") + "systemctl " + (userspace ? "--user " : "");
           exec(launcherstr + "daemon-reload", execOpts, function (err, stdout, stderr) {
-            console.log(stdout);
+            if (err) { console.error(err); }
+				    console.log((stdout||'').trim());
             if (stderr) { console.error(stderr); }
             exec(launcherstr + "enable " + launcher, execOpts, function (err, stdout, stderr) {
-              console.log(stdout);
+              if (err) { console.error(err); }
+				      console.log((stdout||'').trim());
               if (stderr) { console.error(stderr); }
               exec(launcherstr + "restart " + launcher, execOpts, function (err, stdout, stderr) {
-                console.log(stdout);
+                if (err) { console.error(err); }
+				        console.log((stdout||'').trim());
                 if (stderr) { console.error(stderr); }
               });
             });
           });
         });
       } catch(e) {
+        console.error("'" + launcher + "' error:");
+        console.error(e);
       }
     }
   , 'reg.exe': function () {
@@ -119,7 +132,7 @@ module.exports.install = function (things) {
         + '" /F'
         ;
 			exec(cmd, execOpts, function (err, stdout, stderr) {
-				console.log(stdout);
+				console.log((stdout||'').trim());
         if (stderr) {
           console.error(stderr);
         }
@@ -131,33 +144,37 @@ module.exports.install = function (things) {
   function run(err, launcher) {
     if (err) {
       console.error("No luck with '" + launcher + "'");
+      console.error(err);
       return;
     }
 
-    if (!launchers[launcher]) {
+    if (launchers[launcher]) {
+      console.log('Launching with launcher ' + launcher);
       launchers[launcher]();
       return;
+    } else {
+      console.error("No launcher handler for '" + launcher+ "'");
     }
   }
 
   // could have used "command-exists" but I'm trying to stay low-dependency
   // os.platform(), os.type()
   if (!/^win/i.test(os.platform())) {
-    if (!/^darwin/i.test(os.platform())) {
+    if (/^darwin/i.test(os.platform())) {
 			exec('type -p launchctl', execOpts, function (err, stdout, stderr) {
-				console.log(stdout);
+				console.log((stdout||'').trim());
         if (stderr) {
           console.error(stderr);
         }
         run(err, 'launchctl');
 			});
     } else {
-			exec('type -p systemctlctl', execOpts, function (err, stdout, stderr) {
-				console.log(stdout);
+			exec('type -p systemctl', execOpts, function (err, stdout, stderr) {
+				console.log((stdout||'').trim());
         if (stderr) {
           console.error(stderr);
         }
-        run(err, 'launchctl');
+        run(err, 'systemctl');
 			});
     }
   } else {
@@ -170,7 +187,7 @@ module.exports.install = function (things) {
     // utils.elevate
     // https://github.com/CatalystCode/windows-registry-node
     exec('where reg.exe', execOpts, function (err, stdout, stderr) {
-      console.log(stdout);
+			console.log((stdout||'').trim());
       if (stderr) {
         console.error(stderr);
       }
@@ -178,3 +195,7 @@ module.exports.install = function (things) {
     });
   }
 };
+
+if (module === require.main) {
+  module.exports.install({});
+}
diff --git a/usr/share/install_helper.sh b/usr/share/install_helper.sh
index b19a263..1cf48df 100644
--- a/usr/share/install_helper.sh
+++ b/usr/share/install_helper.sh
@@ -300,6 +300,8 @@ export TELEBIT_BIN=$TELEBIT_REAL_PATH/bin/telebit
 export TELEBITD_BIN=$TELEBIT_REAL_PATH/bin/telebitd
 export TELEBIT_JS=$TELEBIT_REAL_PATH/bin/telebit.js
 export TELEBITD_JS=$TELEBIT_REAL_PATH/bin/telebitd.js
+export NODE_PATH="$TELEBIT_REAL_PATH/lib/node_modules"
+export NPM_CONFIG_PREFIX="$TELEBIT_REAL_PATH"
 
 $my_node $TELEBIT_TMP/usr/share/template-launcher.js
 
diff --git a/usr/share/template-launcher.js b/usr/share/template-launcher.js
index adec834..94a3110 100644
--- a/usr/share/template-launcher.js
+++ b/usr/share/template-launcher.js
@@ -20,6 +20,8 @@ module.exports.sync = function (opts) {
   var text = fs.readFileSync(f.tpl, 'utf8')
     .replace(/{TELEBIT_PATH}/g, vars.telebitPath || '{TELEBIT_PATH}')
     .replace(/{TELEBIT_NODE}/g, vars.telebitNode || '{TELEBIT_NODE}')
+    .replace(/{NODE_PATH}/g, vars.nodePath || '{NODE_PATH}')
+    .replace(/{NPM_CONFIG_PREFIX}/g, vars.npmConfigPrefix || '{NPM_CONFIG_PREFIX}')
     .replace(/{TELEBIT_NPM}/g, vars.telebitNpm || '{TELEBIT_NPM}')
     .replace(/{TELEBIT_BIN}/g, vars.telebitBin || '{TELEBIT_BIN}')
     .replace(/{TELEBITD_BIN}/g, vars.telebitdBin || '{TELEBITD_BIN}')
@@ -54,8 +56,7 @@ function run() {
     var telebitRoot = path.resolve(__dirname, '../..');
     var vars = {
       telebitPath: process.env.TELEBIT_PATH || telebitRoot
-    , telebitNode: process.env.TELEBIT_NODE || path.resolve(telebitRoot, 'bin/node')
-    , telebitNpm: process.env.TELEBIT_NPM || path.resolve(telebitRoot, 'bin/npm')
+    , telebitNode: process.env.TELEBIT_NODE || process.argv[0] || path.resolve(telebitRoot, 'bin/node')
     , telebitBin: process.env.TELEBIT_BIN || path.resolve(telebitRoot, 'bin/telebit')
     , telebitdBin: process.env.TELEBITD_BIN || path.resolve(telebitRoot, 'bin/telebitd')
     , telebitJs: process.env.TELEBIT_JS || path.resolve(telebitRoot, 'bin/telebit.js')
@@ -64,12 +65,19 @@ function run() {
         (process.env.TELEBIT_PATH || path.resolve(__dirname, '../..'))
       , path.join(os.homedir(), '.config/telebit')
       , path.join(os.homedir(), '.local/share/telebit')
-      ].join(' ')
+      ]
     , telebitUser: process.env.TELEBIT_USER || os.userInfo().username
     , telebitGroup: process.env.TELEBIT_GROUP || ('darwin' === os.platform() ? 'staff' : os.userInfo().username)
     , telebitConfig: process.env.TELEBIT_CONFIG || path.join(os.homedir(), '.config/telebit/telebit.yml')
     , telebitdConfig: process.env.TELEBITD_CONFIG || path.join(os.homedir(), '.config/telebit/telebitd.yml')
     };
+    vars.telebitNpm = process.env.TELEBIT_NPM || path.resolve(vars.telebitNode, '../npm');
+    vars.nodePath = process.env.NODE_PATH || path.resolve(vars.telebitNode, '../lib/node_modules');
+    vars.npmConfigPrefix = process.env.NPM_CONFIG_PREFIX || path.resolve(vars.telebitNode, '..');
+    if (-1 === vars.telebitRwDirs.indexOf(vars.npmConfigPrefix)) {
+      vars.telebitRwDirs.push(vars.npmConfigPrefix);
+    }
+    vars.telebitRwDirs = vars.telebitRwDirs.join(' ');
     module.exports({
       file: f
     , vars: vars