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

Add workaround for bash issues with pre-saving

Browse Source
This commit is contained in:
David Dworken 2023-09-24 16:35:00 -07:00
parent 5ac6f297fb
commit 89014a8674
No known key found for this signature in database
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/cmd/saveHistoryEntry.go
View File

@ -154,8 +154,14 @@ func presaveHistoryEntry(ctx context.Context) {
entry.StartTime = time.Unix(startTime, 0).UTC() entry.StartTime = time.Unix(startTime, 0).UTC()
entry.EndTime = time.Unix(0, 0).UTC() entry.EndTime = time.Unix(0, 0).UTC()
// Skip saving references to presaving // Shell workaround: Pre-saving on bash relies on the $BASH_COMMAND variable which also will get set/executed
if strings.Contains(entry.Command, "presaveHistoryEntry") || strings.Contains(entry.Command, "__history_control_r") { // when running shell scripts/functions, but saveHistoryEntry will never be invoked for those entries.
// This leads to problems where the history gets filled with some bogus pre-saved entries from shell
// scripts or .bashrc files. Attempt to workaround this by filtering out certain patterns that are
// especially likely to fall into this.
// TODO: Try to improve this ^
shellName := os.Args[2]
if shellName == "bash" && (strings.Contains(entry.Command, "presaveHistoryEntry") || strings.HasPrefix(entry.Command, "_")) {
return return
} }