add webi install instructions

README.md

@@ -1,4 +1,4 @@
-# go-serviceman
+# [go-serviceman](https://git.rootprojects.org/root/serviceman)
 
 Cross-platform service management made easy.
 
@@ -77,6 +77,24 @@ The **default** is to register a _user_ services. To register a _system_ service
 
 # Install
 
+You can install `serviceman` directly from the official git releases with [`webi`](https://webinstall.dev/serviceman):
+
+**Mac**, **Linux**:
+
+```bash
+curl -sL https://webinstall.dev/serviceman | bash
+```
+
+**Windows 10**:
+
+```pwsh
+curl.exe -sLA "MS" https://webinstall.dev/serviceman | powershell
+```
+
+You can run this from cmd.exe or PowerShell (curl.exe is a native part of Windows 10).
+
+## Manual Install
+
 There are a number of pre-built binaries.
 
 If none of them work for you, or you prefer to build from source,
@@ -84,8 +102,16 @@ see the instructions for building far down below.
 
 ## Downloads
 
+```
+curl -fsSL "https://rootprojects.org/serviceman/dist/$(uname -s)/$(uname -m)/serviceman" -o serviceman
+chmod +x ./serviceman
+```
+
 ### MacOS
 
+<details>
+<summary>See download options</summary>
+
 MacOS (darwin): [64-bit Download ](https://rootprojects.org/serviceman/dist/darwin/amd64/serviceman)
 
 ```
@@ -93,6 +119,8 @@ curl https://rootprojects.org/serviceman/dist/darwin/amd64/serviceman -o service
 chmod +x ./serviceman
 ```
 
+</details>
+
 ### Windows
 
 <details>
@@ -125,6 +153,7 @@ powershell.exe "(New-Object Net.WebClient).DownloadFile('https://rootprojects.or
 
 ### Linux
 
+
 <details>
 <summary>See download options</summary>
 
@@ -620,4 +649,3 @@ MPL-2.0 |
 Copyright 2019 AJ ONeal.
 
 <!-- {{ end }} -->
-<!-- {{ end }} -->

manager/install_windows.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"strings"
 
@@ -288,6 +289,13 @@ func installServiceman(c *service.Service) ([]string, error) {
 		if nil != err {
 			return nil, err
 		}
+		// Note: self may be the short name, in which case
+		// we should just use whatever is closest in the path
+		// exec.LookPath will handle this correctly
+		self, err = exec.LookPath(self)
+		if nil != err {
+			return nil, err
+		}
 		bin, err := ioutil.ReadFile(self)
 		if nil != err {
 			return nil, err

manager/start.go

@@ -3,6 +3,7 @@ package manager
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 	"os/exec"
 	"path/filepath"
 	"strings"
@@ -121,7 +122,12 @@ func getSystemSrvs() ([]string, error) {
 }
 
 func getUserSrvs(home string) ([]string, error) {
-	return getSrvs(filepath.Join(home, srvUserPath))
+	confDir := filepath.Join(home, srvUserPath)
+	err := os.MkdirAll(confDir, 0755)
+	if nil != err {
+		return nil, err
+	}
+	return getSrvs(confDir)
 }
 
 // "come.example.foo.plist" matches "foo"

manager/start_stop_test.go

@@ -0,0 +1,32 @@
+package manager
+
+import (
+	"fmt"
+	"io/ioutil"
+	"os"
+	"path/filepath"
+	"testing"
+)
+
+func TestEmptyUserServicePath(t *testing.T) {
+	srvs, err := getUserSrvs("/tmp/fakeuser")
+	if nil != err {
+		t.Fatal(err)
+	}
+	if len(srvs) > 0 {
+		t.Fatal(fmt.Errorf("sanity fail: shouldn't get services from empty directory"))
+	}
+
+	dirs, err := ioutil.ReadDir(filepath.Join("/tmp/fakeuser", srvUserPath))
+	if nil != err {
+		t.Fatal(err)
+	}
+	if len(dirs) > 0 {
+		t.Fatal(fmt.Errorf("sanity fail: shouldn't get listing from empty directory"))
+	}
+
+	err = os.RemoveAll("/tmp/fakeuser")
+	if nil != err {
+		panic("couldn't remove /tmp/fakeuser")
+	}
+}

manager/static/ab0x.go

@@ -1,5 +1,5 @@
-// Code generated by fileb0x at "2019-08-05 10:04:21.752835 -0600 MDT m=+0.004628888" from config file "b0x.toml" DO NOT EDIT.
-// modification hash(e0dad2aef9534d24be436f8d9dd5e9cc.acdb557394f98d3c09c0bb4d4b9142f8)
+// Code generated by fileb0x at "2019-08-05 10:09:44.205977 -0600 MDT m=+0.003863161" from config file "b0x.toml" DO NOT EDIT.
+// modification hash(25df1985b6a67dc5b8f5c9281219965c.acdb557394f98d3c09c0bb4d4b9142f8)
 
 package static
 

npm/bin/serviceman

@@ -0,0 +1 @@
+# this will be replaced by the postinstall script

npm/package.json

@@ -1,10 +1,19 @@
 {
 	"name": "serviceman",
-	"version": "0.5.2",
+	"version": "0.7.0",
 	"description": "A cross-platform service manager",
 	"main": "index.js",
+	"homepage": "https://git.rootprojects.org/root/serviceman/src/branch/master/npm",
+	"files": [
+		"bin/",
+		"scripts/"
+	],
+	"bin": {
+		"serviceman": "bin/serviceman"
+	},
 	"scripts": {
-		"postinstall": "scripts/fetch-serviceman.js",
+		"serviceman": "serviceman",
+		"postinstall": "node scripts/fetch-serviceman.js",
 		"test": "echo \"Error: no test specified\" && exit 1"
 	},
 	"repository": {

npm/scripts/fetch-serviceman.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 'use strict';
+var path = require('path');
 var os = require('os');
 
 // https://nodejs.org/api/os.html#os_os_arch
@@ -10,7 +11,7 @@ var arch = os.arch(); // process.arch
 // https://nodejs.org/api/os.html#os_os_platform
 // 'aix', 'darwin', 'freebsd', 'linux', 'openbsd', 'sunos', 'win32'
 var platform = os.platform(); // process.platform
-var ext = 'windows' === platform ? '.exe' : '';
+var ext = /^win/i.test(platform) ? '.exe' : '';
 
 // This is _probably_ right. It's good enough for us
 // https://github.com/nodejs/node/issues/13629
@@ -53,15 +54,26 @@ var mkdirp = require('@root/mkdirp');
 
 function needsUpdate(oldVer, newVer) {
 	// "v1.0.0-pre" is BEHIND "v1.0.0"
-	newVer = newVer.replace(/^v/, '').split(/[\.\-\+]/);
-	oldVer = oldVer.replace(/^v/, '').split(/[\.\-\+]/);
-	//console.log(oldVer, newVer);
+	newVer = newVer
+		.replace(/^v/, '')
+		.split(/[\.\-\+]/)
+		.filter(Boolean);
+	oldVer = oldVer
+		.replace(/^v/, '')
+		.split(/[\.\-\+]/)
+		.filter(Boolean);
 
+	if (!oldVer.length) {
+		return true;
+	}
+
+	// ex: v1.0.0-pre vs v1.0.0
 	if (newVer[3] && !oldVer[3]) {
 		// don't install beta over stable
 		return false;
 	}
 
+	// ex: old is v1.0.0-pre
 	if (oldVer[3]) {
 		if (oldVer[2] > 0) {
 			oldVer[2] -= 1;
@@ -77,6 +89,8 @@ function needsUpdate(oldVer, newVer) {
 			return true;
 		}
 	}
+
+	// ex: v1.0.1 vs v1.0.0-pre
 	if (newVer[3]) {
 		if (newVer[2] > 0) {
 			newVer[2] -= 1;
@@ -93,7 +107,7 @@ function needsUpdate(oldVer, newVer) {
 		}
 	}
 
-	//console.log(oldVer, newVer);
+	// ex: v1.0.1 vs v1.0.0
 	if (oldVer[0] > newVer[0]) {
 		return false;
 	} else if (oldVer[0] < newVer[0]) {
@@ -128,12 +142,13 @@ console.log(false === needsUpdate('0.5.0', '0.5.0-pre1'));
 console.log(false === needsUpdate('0.5.1', '0.5.0'));
 */
 
-exec('serviceman version', { windowsHide: true }, function(err, stdout) {
-	var oldVer = (stdout || '').split(' ')[0];
-	console.log(oldVer, newVer);
+function install(name, bindirs, getVersion, parseVersion, urlTpl) {
+	exec(getVersion, { windowsHide: true }, function(err, stdout) {
+		var oldVer = parseVersion(stdout);
+		//console.log('old:', oldVer, 'new:', newVer);
 		if (!needsUpdate(oldVer, newVer)) {
 			console.info(
-			'Current serviceman version is new enough:',
+				'Current ' + name + ' version is new enough:',
 				oldVer,
 				newVer
 			);
@@ -142,7 +157,7 @@ exec('serviceman version', { windowsHide: true }, function(err, stdout) {
 			//	console.info('Current serviceman version is older:', oldVer, newVer);
 		}
 
-	var url = 'https://rootprojects.org/serviceman/dist/{{ .Platform }}/{{ .Arch }}/serviceman{{ .Ext }}'
+		var url = urlTpl
 			.replace(/{{ .Version }}/g, newVer)
 			.replace(/{{ .Platform }}/g, platform)
 			.replace(/{{ .Arch }}/g, arch)
@@ -157,43 +172,98 @@ exec('serviceman version', { windowsHide: true }, function(err, stdout) {
 
 			//console.log(resp.body.byteLength);
 			//console.log(typeof resp.body);
-		var serviceman = 'serviceman' + ext;
-		return fs.writeFile(serviceman, resp.body, null, function(err) {
-			if (err) {
-				console.error(err);
+			var bin = name + ext;
+			function next() {
+				if (!bindirs.length) {
 					return;
 				}
-			fs.chmodSync(serviceman, parseInt('0755', 8));
-
-			var path = require('path');
-			var localdir = '/usr/local/bin';
-			fs.rename(serviceman, path.join(localdir, serviceman), function(
-				err
-			) {
-				if (err) {
-					//console.error(err);
-				}
-				// ignore
-			});
-
-			var homedir = require('os').homedir();
-			var bindir = path.join(homedir, '.local', 'bin');
+				var bindir = bindirs.pop();
 				return mkdirp(bindir, function(err) {
 					if (err) {
 						console.error(err);
 						return;
 					}
 
-				var localsrv = path.join(bindir, serviceman);
+					var localsrv = path.join(bindir, bin);
 					return fs.writeFile(localsrv, resp.body, function(err) {
+						next();
 						if (err) {
 							console.error(err);
 							return;
 						}
 						fs.chmodSync(localsrv, parseInt('0755', 8));
-					console.info('Wrote', serviceman, 'to', bindir);
-				});
+						console.info('Wrote', bin, 'to', bindir);
 					});
 				});
+			}
+			next();
 		});
 	});
+}
+
+function winstall(name, bindir) {
+	try {
+		fs.writeFileSync(
+			path.join(bindir, name),
+			'#!/usr/bin/env bash\n"$(dirname "$0")/serviceman.exe" "$@"\nexit $?'
+		);
+	} catch (e) {
+		// ignore
+	}
+
+	// because bugs in npm + git bash oddities, of course
+	// https://npm.community/t/globally-installed-package-does-not-execute-in-git-bash-on-windows/9394
+	try {
+		fs.writeFileSync(
+			path.join(path.join(__dirname, '../../.bin'), name),
+			[
+				'#!/bin/sh',
+				'# manual bugfix patch for npm on windows',
+				'basedir=$(dirname "$(echo "$0" | sed -e \'s,\\\\,/,g\')")',
+				'"$basedir/../' + name + '/bin/' + name + '"   "$@"',
+				'exit $?'
+			].join('\n')
+		);
+	} catch (e) {
+		// ignore
+	}
+	try {
+		fs.writeFileSync(
+			path.join(path.join(__dirname, '../../..'), name),
+			[
+				'#!/bin/sh',
+				'# manual bugfix patch for npm on windows',
+				'basedir=$(dirname "$(echo "$0" | sed -e \'s,\\\\,/,g\')")',
+				'"$basedir/node_modules/' + name + '/bin/' + name + '"   "$@"',
+				'exit $?'
+			].join('\n')
+		);
+	} catch (e) {
+		// ignore
+	}
+	// end bugfix
+}
+
+function run() {
+	//var homedir = require('os').homedir();
+	//var bindir = path.join(homedir, '.local', 'bin');
+	var bindir = path.resolve(__dirname, '..', 'bin');
+	var name = 'serviceman';
+	if ('.exe' === ext) {
+		winstall(name, bindir);
+	}
+
+	return install(
+		name,
+		[bindir],
+		'serviceman version',
+		function parseVersion(stdout) {
+			return (stdout || '').split(' ')[0];
+		},
+		'https://rootprojects.org/serviceman/dist/{{ .Platform }}/{{ .Arch }}/serviceman{{ .Ext }}'
+	);
+}
+
+if (require.main === module) {
+	run();
+}

serviceman.go

@@ -230,7 +230,7 @@ func add() {
 	}
 
 	if len(ass) > 0 {
-		fmt.Println("OPTIONS: Making some assumptions...\n")
+		fmt.Printf("OPTIONS: Making some assumptions...\n\n")
 		for i := range ass {
 			fmt.Println("\t" + ass[i])
 		}
@@ -350,7 +350,7 @@ func list() {
 		fmt.Fprintf(os.Stderr, "\n")
 	}
 
-	fmt.Println("serviceman-managed services:\n")
+	fmt.Printf("serviceman-managed services:\n\n")
 	for i := range managed {
 		fmt.Println("\t" + managed[i])
 	}
@@ -360,7 +360,7 @@ func list() {
 	fmt.Println("")
 
 	if verbose {
-		fmt.Println("other services:\n")
+		fmt.Printf("other services:\n\n")
 		for i := range others {
 			fmt.Println("\t" + others[i])
 		}