misc: small fix or general refactoring i did not bother commenting

This commit is contained in:
evilsocket 2018-09-21 19:40:56 +02:00
commit 654585ff1f
No known key found for this signature in database
GPG key ID: 82E42E7F3B34C97E
3 changed files with 12 additions and 15 deletions

View file

@ -8,16 +8,18 @@ import (
)
const (
EnvVarName = "CAPSPATH"
Suffix = ".cap"
InstallArchive = "https://github.com/bettercap/caplets/archive/master.zip"
InstallBase = "/usr/local/share/bettercap/"
InstallPathArchive = "/usr/local/share/bettercap/caplets-master/"
InstallPath = "/usr/local/share/bettercap/caplets/"
EnvVarName = "CAPSPATH"
Suffix = ".cap"
InstallArchive = "https://github.com/bettercap/caplets/archive/master.zip"
InstallBase = "/usr/local/share/bettercap/"
)
var (
InstallPathArchive = filepath.Join(InstallBase, "caplets-master")
InstallPath = filepath.Join(InstallBase, "caplets")
LoadPaths = []string{
"./",
"./caplets/",
InstallPath,
}

View file

@ -19,9 +19,7 @@ var (
func List() []Caplet {
caplets := make([]Caplet, 0)
cwd, _ := filepath.Abs(".")
for _, searchPath := range append([]string{cwd}, LoadPaths...) {
for _, searchPath := range LoadPaths {
files, _ := filepath.Glob(searchPath + "/*" + Suffix)
files2, _ := filepath.Glob(searchPath + "/*/*" + Suffix)
@ -54,15 +52,12 @@ func Load(name string) (error, *Caplet) {
return nil, caplet
}
names := []string{name}
names := []string{}
if !strings.HasSuffix(name, Suffix) {
names = append(names, name+Suffix)
name += Suffix
}
for _, path := range LoadPaths {
if !strings.HasSuffix(name, Suffix) {
name += Suffix
}
names = append(names, filepath.Join(path, name))
}

View file

@ -98,7 +98,7 @@ func (c *CapletsModule) Paths() error {
colNames := []string{
"Path",
}
rows := [][]string{[]string{"."}}
rows := [][]string{}
for _, path := range caplets.LoadPaths {
rows = append(rows, []string{path})