github/bettercap
1
0
Fork 0
mirror of https://github.com/bettercap/bettercap synced 2025-07-30 11:40:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Minor refactors using golint"

Browse source
This commit is contained in:
Simone Margaritelli 2018-05-03 12:31:42 +02:00 • committed by GitHub
parent 9196be7a8b
commit 5328ced392
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 101 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/core.go
View file

@ -66,8 +66,9 @@ func ExecSilent(executable string, args []string) (string, error) {
raw, err := exec.Command(path, args...).CombinedOutput()
if err != nil {
return "", err
} else {
return Trim(string(raw)), nil
}
return Trim(string(raw)), nil
}
func Exec(executable string, args []string) (string, error) {
@ -92,9 +93,10 @@ func ExpandPath(path string) (string, error) {
usr, err := user.Current()
if err != nil {
return "", err
} else {
// Replace only the first occurrence of ~
path = strings.Replace(path, "~", usr.HomeDir, 1)
}
// Replace only the first occurrence of ~
path = strings.Replace(path, "~", usr.HomeDir, 1)
}
return filepath.Abs(path)
}