diff --git a/README.md b/README.md index 0b6fb3f1..c69e38f4 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ K9s is available on Linux, macOS and Windows platforms. * Binaries for Linux, Windows and Mac are available as tarballs in the [release](https://github.com/derailed/k9s/releases) page. -* Via Homebrew for macOS or LinuxBrew for Linux +* Via [Homebrew](https://brew.sh/) for macOS or Linux ```shell brew install k9s diff --git a/internal/dao/log_item.go b/internal/dao/log_item.go index bdce7b08..a66e1748 100644 --- a/internal/dao/log_item.go +++ b/internal/dao/log_item.go @@ -73,6 +73,7 @@ func (l *LogItem) Render(paint string, showTime bool, bb *bytes.Buffer) { for i := len(l.Bytes[:index]); i < 30; i++ { bb.WriteByte(' ') } + bb.WriteString("[-::]") } if l.Pod != "" { diff --git a/internal/dao/log_item_test.go b/internal/dao/log_item_test.go index ac9632b7..1eeacc54 100644 --- a/internal/dao/log_item_test.go +++ b/internal/dao/log_item_test.go @@ -63,7 +63,7 @@ func TestLogItemRender(t *testing.T) { ShowTimestamp: true, }, log: fmt.Sprintf("%s %s\n", "2018-12-14T10:36:43.326972-07:00", "Testing 1,2,3..."), - e: "[gray::b]2018-12-14T10:36:43.326972-07:00 [yellow::]fred [yellow::b]blee[-::-] Testing 1,2,3...\n", + e: "[gray::b]2018-12-14T10:36:43.326972-07:00 [-::][yellow::]fred [yellow::b]blee[-::-] Testing 1,2,3...\n", }, "log-level": { opts: dao.LogOptions{ diff --git a/internal/dao/log_items_test.go b/internal/dao/log_items_test.go index ec491c10..e4e2742e 100644 --- a/internal/dao/log_items_test.go +++ b/internal/dao/log_items_test.go @@ -108,7 +108,7 @@ func TestLogItemsRender(t *testing.T) { Container: "blee", ShowTimestamp: true, }, - e: "[gray::b]2018-12-14T10:36:43.326972-07:00 [teal::]fred [teal::b]blee[-::-] Testing 1,2,3...\n", + e: "[gray::b]2018-12-14T10:36:43.326972-07:00 [-::][teal::]fred [teal::b]blee[-::-] Testing 1,2,3...\n", }, } diff --git a/internal/view/log_indicator.go b/internal/view/log_indicator.go index 959b51aa..ff360b58 100644 --- a/internal/view/log_indicator.go +++ b/internal/view/log_indicator.go @@ -113,32 +113,32 @@ func (l *LogIndicator) Refresh() { if l.shouldDisplayAllContainers { if l.allContainers { - l.indicator = append(l.indicator, "[::b]AllContainers:[limegreen::b]On[-::]"+spacer...) + l.indicator = append(l.indicator, "[::b]AllContainers:[limegreen::b]On[-::] "+spacer...) } else { l.indicator = append(l.indicator, "[::b]AllContainers:[gray::d]Off[-::]"+spacer...) } } if l.AutoScroll() { - l.indicator = append(l.indicator, "[::b]Autoscroll:[limegreen::b]On[-::]"+spacer...) + l.indicator = append(l.indicator, "[::b]Autoscroll:[limegreen::b]On[-::] "+spacer...) } else { l.indicator = append(l.indicator, "[::b]Autoscroll:[gray::d]Off[-::]"+spacer...) } if l.FullScreen() { - l.indicator = append(l.indicator, "[::b]FullScreen:[limegreen::b]On[-::]"+spacer...) + l.indicator = append(l.indicator, "[::b]FullScreen:[limegreen::b]On[-::] "+spacer...) } else { l.indicator = append(l.indicator, "[::b]FullScreen:[gray::d]Off[-::]"+spacer...) } if l.Timestamp() { - l.indicator = append(l.indicator, "[::b]Timestamps:[limegreen::b]On[-::]"+spacer...) + l.indicator = append(l.indicator, "[::b]Timestamps:[limegreen::b]On[-::] "+spacer...) } else { l.indicator = append(l.indicator, "[::b]Timestamps:[gray::d]Off[-::]"+spacer...) } if l.TextWrap() { - l.indicator = append(l.indicator, "[::b]Wrap:[limegreen::b]On[-::]"...) + l.indicator = append(l.indicator, "[::b]Wrap:[limegreen::b]On[-::] "...) } else { l.indicator = append(l.indicator, "[::b]Wrap:[gray::d]Off[-::]"...) } diff --git a/internal/view/log_indicator_test.go b/internal/view/log_indicator_test.go index 92649d7b..2432a938 100644 --- a/internal/view/log_indicator_test.go +++ b/internal/view/log_indicator_test.go @@ -15,10 +15,10 @@ func TestLogIndicatorRefresh(t *testing.T) { e string }{ "all-containers": { - view.NewLogIndicator(config.NewConfig(nil), defaults, true), "[::b]AllContainers:[gray::d]Off[-::] [::b]Autoscroll:[limegreen::b]On[-::] [::b]FullScreen:[gray::d]Off[-::] [::b]Timestamps:[gray::d]Off[-::] [::b]Wrap:[gray::d]Off[-::]\n", + view.NewLogIndicator(config.NewConfig(nil), defaults, true), "[::b]AllContainers:[gray::d]Off[-::] [::b]Autoscroll:[limegreen::b]On[-::] [::b]FullScreen:[gray::d]Off[-::] [::b]Timestamps:[gray::d]Off[-::] [::b]Wrap:[gray::d]Off[-::]\n", }, "plain": { - view.NewLogIndicator(config.NewConfig(nil), defaults, false), "[::b]Autoscroll:[limegreen::b]On[-::] [::b]FullScreen:[gray::d]Off[-::] [::b]Timestamps:[gray::d]Off[-::] [::b]Wrap:[gray::d]Off[-::]\n", + view.NewLogIndicator(config.NewConfig(nil), defaults, false), "[::b]Autoscroll:[limegreen::b]On[-::] [::b]FullScreen:[gray::d]Off[-::] [::b]Timestamps:[gray::d]Off[-::] [::b]Wrap:[gray::d]Off[-::]\n", }, }