Fixed Home method

sentinel-official · Jan 19, 2023 · 6362987 · 6362987
1 parent 8a0f823
commit 6362987
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/services/wireguard/wireguard.go b/services/wireguard/wireguard.go
@@ -60,7 +60,7 @@ func (w *WireGuard) PostUp() error  { return nil }
 func (w *WireGuard) PreDown() error { return nil }
 
 func (w *WireGuard) PostDown() error {
-	cfgFilePath := filepath.Join(w.Home(), fmt.Sprintf("%s.conf", w.cfg.Name))
+	cfgFilePath := filepath.Join(w.home, fmt.Sprintf("%s.conf", w.cfg.Name))
 	if _, err := os.Stat(cfgFilePath); err != nil {
 		return nil
 	}

diff --git a/services/wireguard/wireguard_darwin.go b/services/wireguard/wireguard_darwin.go
@@ -34,7 +34,7 @@ func (w *WireGuard) ExecFile(name string) string {
 
 func (w *WireGuard) Up() error {
 	var (
-		cfgFilePath = filepath.Join(w.Home(), fmt.Sprintf("%s.conf", w.cfg.Name))
+		cfgFilePath = filepath.Join(w.home, fmt.Sprintf("%s.conf", w.cfg.Name))
 		cmd         = exec.Command(w.ExecFile("wg-quick"), strings.Split(
 			fmt.Sprintf("up %s", shellescape.Quote(cfgFilePath)), " ")...)
 	)
@@ -46,7 +46,7 @@ func (w *WireGuard) Up() error {
 
 func (w *WireGuard) Down() error {
 	var (
-		cfgFilePath = filepath.Join(w.Home(), fmt.Sprintf("%s.conf", w.cfg.Name))
+		cfgFilePath = filepath.Join(w.home, fmt.Sprintf("%s.conf", w.cfg.Name))
 		cmd         = exec.Command(w.ExecFile("wg-quick"), strings.Split(
 			fmt.Sprintf("down %s", shellescape.Quote(cfgFilePath)), " ")...)
 	)

diff --git a/services/wireguard/wireguard_linux.go b/services/wireguard/wireguard_linux.go
@@ -20,7 +20,7 @@ func (w *WireGuard) ExecFile(name string) string {
 
 func (w *WireGuard) Up() error {
 	var (
-		cfgFilePath = filepath.Join(w.Home(), fmt.Sprintf("%s.conf", w.cfg.Name))
+		cfgFilePath = filepath.Join(w.home, fmt.Sprintf("%s.conf", w.cfg.Name))
 		cmd         = exec.Command(w.ExecFile("wg-quick"), strings.Split(
 			fmt.Sprintf("up %s", shellescape.Quote(cfgFilePath)), " ")...)
 	)

diff --git a/services/wireguard/wireguard_windows.go b/services/wireguard/wireguard_windows.go
@@ -17,7 +17,7 @@ func (w *WireGuard) ExecFile(name string) string {
 
 func (w *WireGuard) Up() error {
 	var (
-		cfgFilePath = filepath.Join(w.Home(), fmt.Sprintf("%s.conf", w.cfg.Name))
+		cfgFilePath = filepath.Join(w.home, fmt.Sprintf("%s.conf", w.cfg.Name))
 		cmd         = exec.Command(
 			w.ExecFile("wireguard.exe"),
 			"/installtunnelservice", cfgFilePath,