Merge d04a345 into ef35c56

kardianos · Jun 2, 2021 · 24d4306 · 24d4306
2 parents ef35c56 + d04a345
commit 24d4306
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/service_systemd_linux.go b/service_systemd_linux.go
@@ -69,7 +69,7 @@ func (s *systemd) Platform() string {
 
 func (s *systemd) configPath() (cp string, err error) {
 	if !s.isUserService() {
-		cp = "/etc/systemd/system/" + s.Config.Name + ".service"
+		cp = "/etc/systemd/system/" + s.unitName()
 		return
 	}
 	homeDir, err := os.UserHomeDir()
@@ -81,10 +81,14 @@ func (s *systemd) configPath() (cp string, err error) {
 	if err != nil {
 		return
 	}
-	cp = filepath.Join(systemdUserDir, s.Config.Name+".service")
+	cp = filepath.Join(systemdUserDir, s.unitName())
 	return
 }
 
+func (s *systemd) unitName() string {
+	return s.Config.Name + ".service"
+}
+
 func (s *systemd) getSystemdVersion() int64 {
 	_, out, err := runWithOutput("systemctl", "--version")
 	if err != nil {
@@ -230,7 +234,7 @@ func (s *systemd) Run() (err error) {
 }
 
 func (s *systemd) Status() (Status, error) {
-	exitCode, out, err := runWithOutput("systemctl", "is-active", s.Name)
+	exitCode, out, err := runWithOutput("systemctl", "is-active", s.unitName())
 	if exitCode == 0 && err != nil {
 		return StatusUnknown, err
 	}
@@ -240,7 +244,7 @@ func (s *systemd) Status() (Status, error) {
 		return StatusRunning, nil
 	case strings.HasPrefix(out, "inactive"):
 		// inactive can also mean its not installed, check unit files
-		exitCode, out, err := runWithOutput("systemctl", "list-unit-files", "-t", "service", s.Name)
+		exitCode, out, err := runWithOutput("systemctl", "list-unit-files", "-t", "service", s.unitName())
 		if exitCode == 0 && err != nil {
 			return StatusUnknown, err
 		}
@@ -279,7 +283,7 @@ func (s *systemd) run(action string, args ...string) error {
 }
 
 func (s *systemd) runAction(action string) error {
-	return s.run(action, s.Name+".service")
+	return s.run(action, s.unitName())
 }
 
 const systemdScript = `[Unit]