service: make System.String() consistent.

Fixes kardianos#15
NNET-ELi · May 1, 2015 · b722966 · b722966
1 parent 4841cf3
commit b722966
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/service_darwin.go b/service_darwin.go
@@ -16,7 +16,7 @@ import (
 
 const maxPathSize = 32 * 1024
 
-const version = "Darwin Launchd"
+const version = "darwin-launchd"
 
 type darwinSystem struct{}
 

diff --git a/service_linux.go b/service_linux.go
@@ -5,25 +5,10 @@
 package service
 
 import (
-	"fmt"
 	"os"
 	"strings"
 )
 
-type linuxSystem struct {
-	interactive  bool
-	selectedName string
-	selectedNew  func(i Interface, c *Config) (Service, error)
-}
-
-func (ls linuxSystem) String() string {
-	return fmt.Sprintf("Linux %s", ls.selectedName)
-}
-
-func (ls linuxSystem) Interactive() bool {
-	return ls.interactive
-}
-
 type linuxSystemService struct {
 	name        string
 	detect      func() bool
@@ -46,7 +31,7 @@ func (sc linuxSystemService) New(i Interface, c *Config) (Service, error) {
 
 func init() {
 	ChooseSystem(linuxSystemService{
-		name:   "systemd",
+		name:   "linux-systemd",
 		detect: isSystemd,
 		interactive: func() bool {
 			is, _ := isInteractive()
@@ -55,7 +40,7 @@ func init() {
 		new: newSystemdService,
 	},
 		linuxSystemService{
-			name:   "Upstart",
+			name:   "linux-upstart",
 			detect: isUpstart,
 			interactive: func() bool {
 				is, _ := isInteractive()
@@ -64,7 +49,7 @@ func init() {
 			new: newUpstartService,
 		},
 		linuxSystemService{
-			name:   "System-V",
+			name:   "unix-systemv",
 			detect: func() bool { return true },
 			interactive: func() bool {
 				is, _ := isInteractive()

diff --git a/service_windows.go b/service_windows.go
@@ -16,7 +16,7 @@ import (
 	"golang.org/x/sys/windows/svc/mgr"
 )
 
-const version = "Windows Service"
+const version = "windows-service"
 
 type windowsService struct {
 	i Interface