Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 15 additions & 0 deletions discovery.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,15 @@ import (

// discover tries to find all PHP versions on the current machine
func (s *PHPStore) discover() {
userHomeDir := userHomeDir()

s.doDiscover()

if userHomeDir != "" {
// Herd-lite
s.addFromDir(filepath.Join(userHomeDir, ".config", "herd-lite", "bin"), nil, "php.new (Herd-lite)")
}

// Under $PATH
paths := s.pathDirectories(s.configDir)
s.log("Looking for PHP in the PATH (%s)", paths)
Expand Down Expand Up @@ -350,3 +357,11 @@ func (s *PHPStore) pathDirectories(configDir string) []string {
}
return dirs
}

func userHomeDir() string {
userHomeDir, err := os.UserHomeDir()
if err != nil {
return ""
}
return userHomeDir
}
8 changes: 0 additions & 8 deletions discovery_windows.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,3 @@ func systemDir() string {
}
return filepath.VolumeName(cwd) + "\\"
}

func userHomeDir() string {
userHomeDir, err := os.UserHomeDir()
if err != nil {
return ""
}
return userHomeDir
}