crtxcr
/
hs9001
mirror of https://github.com/quitesimpleorg/hs9001.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bug in cwd search and fix go-staticcheck regexp complaint

This commit is contained in:
lawl 2021-06-05 15:05:18 +02:00
parent 16752411e1
commit b9e3a3629b
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
main.go
View File

@ -282,7 +282,7 @@ func main() {
}
historycmd := args[0]
var rgx = regexp.MustCompile("\\s+\\d+\\s+(.*)")
var rgx = regexp.MustCompile(`\s+\d+\s+(.*)`)
rs := rgx.FindStringSubmatch(historycmd)
if len(rs) == 2 {
add(conn, NewHistoryEntry(rs[1], ret))
@ -316,11 +316,14 @@ func main() {
}
q := strings.Join(args, " ")
cwdPath, err := filepath.Abs(workDir)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed parse working directory path: %s\n", err.Error())
if workDir != "%" {
workDir, err = filepath.Abs(workDir)
if err != nil {
fmt.Fprintf(os.Stderr, "Failed parse working directory path: %s\n", err.Error())
}
}
results := search(conn, "%"+q+"%", cwdPath, beginTimestamp, endTimeStamp, retVal)
results := search(conn, "%"+q+"%", workDir, beginTimestamp, endTimeStamp, retVal)
previousCmd := ""
for e := results.Front(); e != nil; e = e.Next() {