Skip to content

Commit ed9e0a2

Browse files
authored
Merge pull request #26 from Kocal/windows-herd-lite
Add support for php.new (herd-lite)
2 parents e62176c + 6e2f51b commit ed9e0a2

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

discovery.go

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,11 @@ import (
3838
func (s *PHPStore) discover() {
3939
s.doDiscover()
4040

41+
if userHomeDir := userHomeDir(); userHomeDir != "" {
42+
// Herd-lite
43+
s.addFromDir(filepath.Join(userHomeDir, ".config", "herd-lite", "bin"), nil, "php.new (Herd-lite)")
44+
}
45+
4146
// Under $PATH
4247
paths := s.pathDirectories(s.configDir)
4348
s.log("Looking for PHP in the PATH (%s)", paths)
@@ -350,3 +355,11 @@ func (s *PHPStore) pathDirectories(configDir string) []string {
350355
}
351356
return dirs
352357
}
358+
359+
func userHomeDir() string {
360+
userHomeDir, err := os.UserHomeDir()
361+
if err != nil {
362+
return ""
363+
}
364+
return userHomeDir
365+
}

discovery_windows.go

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,3 @@ func systemDir() string {
6060
}
6161
return filepath.VolumeName(cwd) + "\\"
6262
}
63-
64-
func userHomeDir() string {
65-
userHomeDir, err := os.UserHomeDir()
66-
if err != nil {
67-
return ""
68-
}
69-
return userHomeDir
70-
}

0 commit comments

Comments
 (0)