main.go

@@ -234,7 +234,7 @@ func exists(path string) (bool, error) {
 }
 
 func printUsage() {
-	fmt.Fprintf(os.Stderr, "Usage:   ./hs9001 <add/search/import/nolog>\n")
+	fmt.Fprintf(os.Stderr, "Usage:   ./hs9001 <add/search/import>\n")
 }
 
 func main() {
@@ -266,8 +266,6 @@ func main() {
 	migrateDatabase(conn, fetchDBVersion(conn))
 
 	switch cmd {
-	case "nolog":
-		fmt.Printf("Run this command to disable logging for the current shell:\n\tunset PROMPT_COMMAND\n")
 	case "add":
 		var ret int
 		addCmd.IntVar(&ret, "ret", 0, "Return value of the command to add")
@@ -282,7 +280,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))
@@ -295,7 +293,7 @@ func main() {
 		var endTime string
 		var distinct bool = true
 		var retVal int
-		searchCmd.StringVar(&workDir, "cwd", "%", "Search only within this workdir")
+		searchCmd.StringVar(&workDir, "workdir", "%", "Search only within this workdir")
 		searchCmd.StringVar(&beginTime, "begin", "50 years ago", "Start searching from this timeframe")
 		searchCmd.StringVar(&endTime, "end", "now", "End searching from this timeframe")
 		searchCmd.BoolVar(&distinct, "distinct", true, "Remove consecutive duplicate commands from output")
@@ -316,13 +314,6 @@ func main() {
 		}
 
 		q := strings.Join(args, " ")
-		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+"%", workDir, beginTimestamp, endTimeStamp, retVal)
 
 		previousCmd := ""