extern/hishtory
1
0
Fork 0
mirror of https://github.com/ddworken/hishtory.git synced 2024-11-22 16:24:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Also read imports from ~/.zhistory which is sometimes used by zsh

Browse Source
This commit is contained in:
David Dworken 2023-10-07 15:19:51 -07:00
parent d2788a9f31
commit 480f8696fb
No known key found for this signature in database
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/lib/lib.go
View File

@ -271,6 +271,10 @@ func ImportHistory(ctx context.Context, shouldReadStdin, force bool) (int, error
if histfile := os.Getenv("HISTFILE"); histfile != "" && histfile != zshHistPath && histfile != bashHistPath { if histfile := os.Getenv("HISTFILE"); histfile != "" && histfile != zshHistPath && histfile != bashHistPath {
entriesIter = concatIterators(entriesIter, readFileToIterator(histfile)) entriesIter = concatIterators(entriesIter, readFileToIterator(histfile))
} }
zHistPath := filepath.Join(homedir, ".zhistory")
if zHistPath != os.Getenv("HISTFILE") {
entriesIter = concatIterators(entriesIter, readFileToIterator(zHistPath))
}
if shouldReadStdin { if shouldReadStdin {
extraEntries, err := readStdin() extraEntries, err := readStdin()
if err != nil { if err != nil {