z2059 - fix macosx daemon for non-standard paths (#85)

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v0.12.2] - 2022-08-16
+
+### Fixed
+- Inherit the `PATH` variable from the user on `daemon install` on `darwin` platform
+
 ## [v0.12.1] - 2022-08-09
 
 ### Fixed

src/cliAction/serviceLogs/handler_formatByTemplate.go

@@ -3,11 +3,12 @@ package serviceLogs
 import (
 	"bytes"
 	"fmt"
-	"golang.org/x/text/cases"
-	"golang.org/x/text/language"
 	"strings"
 	"text/template"
 
+	"golang.org/x/text/cases"
+	"golang.org/x/text/language"
+
 	"github.com/zerops-io/zcli/src/i18n"
 )
 

src/cmd/args.go

@@ -2,6 +2,7 @@ package cmd
 
 import (
 	"fmt"
+
 	"github.com/zerops-io/zcli/src/i18n"
 
 	"github.com/spf13/cobra"

src/cmd/root.go

@@ -3,11 +3,12 @@ package cmd
 import (
 	"context"
 	"fmt"
-	"github.com/zerops-io/zcli/src/i18n"
 	"os"
 	"os/signal"
 	"syscall"
 
+	"github.com/zerops-io/zcli/src/i18n"
+
 	"github.com/zerops-io/zcli/src/support"
 
 	"github.com/spf13/cobra"

src/daemonInstaller/handler_darwin.go

@@ -30,6 +30,8 @@ func newDaemon(name, description string, dependencies []string) (daemon, error)
 	}, nil
 }
 
+const defaultPath = "/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin"
+
 func (daemon *darwinRecord) Install() error {
 	if daemon.IsInstalled() {
 		return ErrAlreadyInstalled
@@ -60,6 +62,11 @@ func (daemon *darwinRecord) Install() error {
 	logDir := filepath.Dir(constants.LogFilePath)
 	daemonStorageDir := filepath.Dir(constants.DaemonStorageFilePath)
 
+	userPath, ok := os.LookupEnv("PATH")
+	if !ok {
+		userPath = defaultPath
+	}
+
 	templ, err := template.New("propertyList").Parse(propertyList)
 	if err != nil {
 		return err
@@ -71,11 +78,13 @@ func (daemon *darwinRecord) Install() error {
 			Name       string
 			LogFile    string
 			WorkingDir string
+			PathEnv    string
 		}{
 			BinaryPath: path.Join(constants.DaemonInstallDir, daemon.name),
 			Name:       daemon.name,
 			LogFile:    constants.LogFilePath,
 			WorkingDir: daemonStorageDir,
+			PathEnv:    userPath,
 		},
 	); err != nil {
 		return err
@@ -182,7 +191,7 @@ var propertyList = `<?xml version="1.0" encoding="UTF-8"?>
     <key>EnvironmentVariables</key>
     <dict>
         <key>PATH</key>
-        <string>/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+        <string>{{.PathEnv}}</string>
 		<key>HOME</key>
         <string>/etc</string>
     </dict>