Skip to content

fix: shell history is not xdg compliant. #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
webbrain-one wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: shell history is not xdg compliant. #2

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions cmd/index.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,7 @@ func watchIndex(ctx context.Context, cfg config.Config, store *storage.Store, in
watchPaths = cfg.IndexedPaths
}
}
home := utils.MustHome()
watchPaths = append(watchPaths, filepath.Join(home, ".bash_history"), filepath.Join(home, ".zsh_history"))
watchPaths = append(watchPaths, historyPaths()...)
added := map[string]struct{}{}
for _, path := range watchPaths {
expanded, err := utils.ExpandHome(path)
Expand Down Expand Up @@ -363,8 +362,7 @@ func runDryRun(ctx context.Context, cfg config.Config, sources []string, paths [
}
summary := dryRunSummary{}
if sourceSet["history"] {
home := utils.MustHome()
for _, path := range []string{filepath.Join(home, ".bash_history"), filepath.Join(home, ".zsh_history")} {
for _, path := range historyPaths() {
info, err := os.Stat(path)
if err != nil || info.IsDir() {
continue
Expand Down Expand Up @@ -460,3 +458,17 @@ func countLines(path string) (int, error) {
}
return count, scanner.Err()
}

func historyPaths() []string {
histFile := os.Getenv("HISTFILE")
if histFile != "" {
if expanded, err := utils.ExpandHome(histFile); err == nil && expanded != "" {
return []string{expanded}
}
}
home := utils.MustHome()
return []string{
filepath.Join(home, ".bash_history"),
filepath.Join(home, ".zsh_history"),
}
}