diff --git a/cmd/cli/main.go b/cmd/cli/main.go index 222f738d..abbeb9c8 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -59,7 +59,7 @@ func runReshCli(out *output.Output, config cfg.Config) (string, int) { const missing = "" flags := pflag.NewFlagSet("", pflag.ExitOnError) - sessionID := flags.String("session-id", missing, "Resh generated session ID") + sessionID := flags.String("session-id", missing, "RESH generated session ID") pwd := flags.String("pwd", missing, "$PWD - present working directory") gitOriginRemote := flags.String("git-remote", missing, "> git remote get-url origin") query := flags.String("query", "", "Search query") diff --git a/cmd/collect/main.go b/cmd/collect/main.go index cd8bb2f3..c2865c69 100644 --- a/cmd/collect/main.go +++ b/cmd/collect/main.go @@ -42,8 +42,8 @@ func main() { gitRemote := flags.String("git-remote", "", "> git remote get-url origin") home := flags.String("home", "", "$HOME") pwd := flags.String("pwd", "", "$PWD - present working directory") - recordID := flags.String("record-id", "", "Resh generated record ID") - sessionID := flags.String("session-id", "", "Resh generated session ID") + recordID := flags.String("record-id", "", "RESH generated record ID") + sessionID := flags.String("session-id", "", "RESH generated session ID") sessionPID := flags.Int("session-pid", -1, "$$ - Shell session PID") shell := flags.String("shell", "", "Current shell") shlvl := flags.Int("shlvl", -1, "$SHLVL") diff --git a/cmd/postcollect/main.go b/cmd/postcollect/main.go index e67e93ba..46b82846 100644 --- a/cmd/postcollect/main.go +++ b/cmd/postcollect/main.go @@ -38,8 +38,8 @@ func main() { flags := pflag.NewFlagSet("", pflag.ExitOnError) exitCode := flags.Int("exit-code", -1, "Exit code") - sessionID := flags.String("session-id", "", "Resh generated session ID") - recordID := flags.String("record-id", "", "Resh generated record ID") + sessionID := flags.String("session-id", "", "RESH generated session ID") + recordID := flags.String("record-id", "", "RESH generated record ID") shlvl := flags.Int("shlvl", -1, "$SHLVL") rtb := flags.String("time-before", "-1", "Before $EPOCHREALTIME") rta := flags.String("time-after", "-1", "After $EPOCHREALTIME") diff --git a/cmd/session-init/main.go b/cmd/session-init/main.go index 2798fc71..b738c93e 100644 --- a/cmd/session-init/main.go +++ b/cmd/session-init/main.go @@ -36,7 +36,7 @@ func main() { args := opt.HandleVersionOpts(out, os.Args, version, commit) flags := pflag.NewFlagSet("", pflag.ExitOnError) - sessionID := flags.String("session-id", "", "Resh generated session ID") + sessionID := flags.String("session-id", "", "RESH generated session ID") sessionPID := flags.Int("session-pid", -1, "$$ - Shell session PID") flags.Parse(args) diff --git a/internal/histfile/histfile.go b/internal/histfile/histfile.go index cdf04f93..34575973 100644 --- a/internal/histfile/histfile.go +++ b/internal/histfile/histfile.go @@ -69,7 +69,7 @@ func (h *Histfile) loadCliRecords(recs []record.V1) { rec := recs[i] h.cliRecords.AddRecord(&rec) } - h.sugar.Infow("Resh history loaded", + h.sugar.Infow("RESH history loaded", "historyRecordsCount", len(h.cliRecords.List), ) } @@ -87,7 +87,7 @@ func (h *Histfile) loadHistory(bashHistoryPath, zshHistoryPath string, maxInitHi useNativeHistories := false if size/1024 < minInitHistSizeKB { useNativeHistories = true - h.sugar.Warnw("Resh_history is too small - loading native bash and zsh history ...") + h.sugar.Warnw("RESH history is too small - loading native bash and zsh history ...") h.bashCmdLines = records.LoadCmdLinesFromBashFile(h.sugar, bashHistoryPath) h.sugar.Infow("Bash history loaded", "cmdLineCount", len(h.bashCmdLines.List)) h.zshCmdLines = records.LoadCmdLinesFromZshFile(h.sugar, zshHistoryPath) @@ -102,7 +102,7 @@ func (h *Histfile) loadHistory(bashHistoryPath, zshHistoryPath string, maxInitHi if err != nil { h.sugar.Fatalf("Failed to read history file: %v", err) } - h.sugar.Infow("Resh history loaded from file", + h.sugar.Infow("RESH history loaded from file", "historyFile", h.historyPath, "recordCount", len(history), ) @@ -110,7 +110,7 @@ func (h *Histfile) loadHistory(bashHistoryPath, zshHistoryPath string, maxInitHi // NOTE: keeping this weird interface for now because we might use it in the future // when we only load bash or zsh history reshCmdLines := loadCmdLines(h.sugar, history) - h.sugar.Infow("Resh history loaded and processed", + h.sugar.Infow("RESH history loaded and processed", "recordCount", len(reshCmdLines.List), ) if !useNativeHistories { diff --git a/scripts/rawinstall.sh b/scripts/rawinstall.sh index ebc7c2a4..f951f5d0 100755 --- a/scripts/rawinstall.sh +++ b/scripts/rawinstall.sh @@ -35,7 +35,7 @@ echo " * Latest version: $version (git tag: $tag)" # TODO: compare semanitcally instead of just using equality if [ "${__RESH_VERSION:-}" == "$version" ]; then - echo " * Resh is up to date - nothing to do - exiting." + echo " * RESH is up to date - nothing to do - exiting." exit 0 fi