interesting
/
complete
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #38 from josharian/fix-installer 

Fix installer
This commit is contained in:
Eyal Posener 2017-05-23 19:33:44 +03:00 committed by GitHub
parent 3e6cff0740 b74be9ff54
commit 8a418a6ab0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/install/install.go
View File

@ -29,7 +29,7 @@ func Install(cmd string) error {
for _, i := range is { for _, i := range is {
errI := i.Install(cmd, bin) errI := i.Install(cmd, bin)
if errI != nil { if errI != nil {
multierror.Append(err, errI) err = multierror.Append(err, errI)
} }
} }
@ -59,8 +59,11 @@ func Uninstall(cmd string) error {
} }
func installers() (i []installer) { func installers() (i []installer) {
if f := rcFile(".bashrc"); f != "" { for _, rc := range [...]string{".bashrc", ".bash_profile"} {
i = append(i, bash{f}) if f := rcFile(rc); f != "" {
i = append(i, bash{f})
break
}
} }
if f := rcFile(".zshrc"); f != "" { if f := rcFile(".zshrc"); f != "" {
i = append(i, zsh{f}) i = append(i, zsh{f})
@ -81,5 +84,9 @@ func rcFile(name string) string {
if err != nil { if err != nil {
return "" return ""
} }
return filepath.Join(u.HomeDir, name) path := filepath.Join(u.HomeDir, name)
if _, err := os.Stat(path); err != nil {
return ""
}
return path
} }