diff --git a/README.md b/README.md index c37da93..d63ea56 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Working and tested on Linux, FreeBSD and macOS. Windows support is planned. Open ### Source ```bash -go get github.com/xxxserxxx/gotop/... +go get github.com/xxxserxxx/gotop/v3/cmd/gotop ``` ### Prebuilt binaries @@ -36,7 +36,7 @@ Unzip it and then move `gotop` into your `$PATH` somewhere. If you're on a Debi The easiest way is to ``` -go get github.com/xxxserxxx/gotop/cmd/gotop +go get github.com/xxxserxxx/gotop/v3/cmd/gotop ``` To create the cross-compile builds, there's a `make.sh` script; it has a lot of dependencies and has only been tested on my computer. When it works, it creates archives for numerous OSes & architectures. There's no testing for whether dependencies are available; it assumes they are and will fail in strange ways when they aren't. diff --git a/build/snapcraft.yaml b/build/snapcraft.yaml index de17ee7..341d8e3 100644 --- a/build/snapcraft.yaml +++ b/build/snapcraft.yaml @@ -15,7 +15,7 @@ parts: gotop: source: . plugin: go - go-importpath: github.com/xxxserxxx/gotop + go-importpath: github.com/xxxserxxx/gotop/v3 build-packages: - git-core - gcc diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go index 0fae9e2..46dbbbf 100644 --- a/cmd/gotop/main.go +++ b/cmd/gotop/main.go @@ -18,12 +18,12 @@ import ( ui "github.com/gizak/termui/v3" "github.com/prometheus/client_golang/prometheus/promhttp" - "github.com/xxxserxxx/gotop" - "github.com/xxxserxxx/gotop/colorschemes" - "github.com/xxxserxxx/gotop/layout" - "github.com/xxxserxxx/gotop/logging" - "github.com/xxxserxxx/gotop/utils" - w "github.com/xxxserxxx/gotop/widgets" + "github.com/xxxserxxx/gotop/v3" + "github.com/xxxserxxx/gotop/v3/colorschemes" + "github.com/xxxserxxx/gotop/v3/layout" + "github.com/xxxserxxx/gotop/v3/logging" + "github.com/xxxserxxx/gotop/v3/utils" + w "github.com/xxxserxxx/gotop/v3/widgets" ) const ( diff --git a/config.go b/config.go index 9109a4b..272a376 100644 --- a/config.go +++ b/config.go @@ -8,8 +8,8 @@ import ( "strings" "time" - "github.com/xxxserxxx/gotop/colorschemes" - "github.com/xxxserxxx/gotop/widgets" + "github.com/xxxserxxx/gotop/v3/colorschemes" + "github.com/xxxserxxx/gotop/v3/widgets" ) // TODO: test, build, release [#119] [#120] [#121] diff --git a/config_test.go b/config_test.go index 329ef75..d567b8f 100644 --- a/config_test.go +++ b/config_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "github.com/xxxserxxx/gotop/widgets" + "github.com/xxxserxxx/gotop/v3/widgets" ) func TestParse(t *testing.T) { diff --git a/devices/temp_freebsd.go b/devices/temp_freebsd.go index ba47474..54355fc 100644 --- a/devices/temp_freebsd.go +++ b/devices/temp_freebsd.go @@ -7,7 +7,7 @@ import ( "strconv" "strings" - "github.com/xxxserxxx/gotop/utils" + "github.com/xxxserxxx/gotop/v3/utils" ) func init() { diff --git a/layout/layout.go b/layout/layout.go index d7fbc22..5cd8f24 100644 --- a/layout/layout.go +++ b/layout/layout.go @@ -5,8 +5,8 @@ import ( "log" "sort" - "github.com/xxxserxxx/gotop" - "github.com/xxxserxxx/gotop/widgets" + "github.com/xxxserxxx/gotop/v3" + "github.com/xxxserxxx/gotop/v3/widgets" ui "github.com/gizak/termui/v3" ) diff --git a/logging/logging.go b/logging/logging.go index 1d189f0..6b023d7 100644 --- a/logging/logging.go +++ b/logging/logging.go @@ -8,7 +8,7 @@ import ( "path/filepath" "sync" - "github.com/xxxserxxx/gotop" + "github.com/xxxserxxx/gotop/v3" ) func New(c gotop.Config) (io.WriteCloser, error) { diff --git a/logging/logging_test.go b/logging/logging_test.go index 3bff162..b56a2a6 100644 --- a/logging/logging_test.go +++ b/logging/logging_test.go @@ -8,7 +8,7 @@ import ( "testing" "github.com/stretchr/testify/assert" - "github.com/xxxserxxx/gotop" + "github.com/xxxserxxx/gotop/v3" ) func TestLogging(t *testing.T) { diff --git a/termui/entry.go b/termui/entry.go index 2ba4ecc..49b3b5b 100644 --- a/termui/entry.go +++ b/termui/entry.go @@ -7,7 +7,7 @@ import ( . "github.com/gizak/termui/v3" rw "github.com/mattn/go-runewidth" - "github.com/xxxserxxx/gotop/utils" + "github.com/xxxserxxx/gotop/v3/utils" ) const ( diff --git a/termui/linegraph.go b/termui/linegraph.go index 63900c1..fffad55 100644 --- a/termui/linegraph.go +++ b/termui/linegraph.go @@ -4,8 +4,8 @@ import ( "image" "sort" - drawille "github.com/xxxserxxx/gotop/termui/drawille-go" . "github.com/gizak/termui/v3" + drawille "github.com/xxxserxxx/gotop/v3/termui/drawille-go" ) // LineGraph implements a line graph of data points. diff --git a/widgets/battery.go b/widgets/battery.go index b47cac4..c283c26 100644 --- a/widgets/battery.go +++ b/widgets/battery.go @@ -10,7 +10,7 @@ import ( "github.com/distatus/battery" "github.com/prometheus/client_golang/prometheus" - ui "github.com/xxxserxxx/gotop/termui" + ui "github.com/xxxserxxx/gotop/v3/termui" ) type BatteryWidget struct { diff --git a/widgets/batterygauge.go b/widgets/batterygauge.go index 59accfb..534c1cf 100644 --- a/widgets/batterygauge.go +++ b/widgets/batterygauge.go @@ -9,7 +9,7 @@ import ( "github.com/distatus/battery" "github.com/prometheus/client_golang/prometheus" - . "github.com/xxxserxxx/gotop/termui" + . "github.com/xxxserxxx/gotop/v3/termui" ) type BatteryGauge struct { diff --git a/widgets/cpu.go b/widgets/cpu.go index 53f5529..5a352ba 100644 --- a/widgets/cpu.go +++ b/widgets/cpu.go @@ -7,9 +7,9 @@ import ( "time" "github.com/prometheus/client_golang/prometheus" - "github.com/xxxserxxx/gotop/devices" + "github.com/xxxserxxx/gotop/v3/devices" - ui "github.com/xxxserxxx/gotop/termui" + ui "github.com/xxxserxxx/gotop/v3/termui" ) type CpuWidget struct { diff --git a/widgets/disk.go b/widgets/disk.go index d1da7a6..3235a6e 100644 --- a/widgets/disk.go +++ b/widgets/disk.go @@ -10,8 +10,8 @@ import ( "github.com/prometheus/client_golang/prometheus" psDisk "github.com/shirou/gopsutil/disk" - ui "github.com/xxxserxxx/gotop/termui" - "github.com/xxxserxxx/gotop/utils" + ui "github.com/xxxserxxx/gotop/v3/termui" + "github.com/xxxserxxx/gotop/v3/utils" ) type Partition struct { diff --git a/widgets/mem.go b/widgets/mem.go index b80b68c..1cfa5c2 100644 --- a/widgets/mem.go +++ b/widgets/mem.go @@ -7,9 +7,9 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/xxxserxxx/gotop/devices" - ui "github.com/xxxserxxx/gotop/termui" - "github.com/xxxserxxx/gotop/utils" + "github.com/xxxserxxx/gotop/v3/devices" + ui "github.com/xxxserxxx/gotop/v3/termui" + "github.com/xxxserxxx/gotop/v3/utils" ) type MemWidget struct { diff --git a/widgets/net.go b/widgets/net.go index 1326fdc..3f03936 100644 --- a/widgets/net.go +++ b/widgets/net.go @@ -9,8 +9,8 @@ import ( "github.com/prometheus/client_golang/prometheus" psNet "github.com/shirou/gopsutil/net" - ui "github.com/xxxserxxx/gotop/termui" - "github.com/xxxserxxx/gotop/utils" + ui "github.com/xxxserxxx/gotop/v3/termui" + "github.com/xxxserxxx/gotop/v3/utils" ) const ( diff --git a/widgets/proc.go b/widgets/proc.go index e4a8ace..406a095 100644 --- a/widgets/proc.go +++ b/widgets/proc.go @@ -12,8 +12,8 @@ import ( psCPU "github.com/shirou/gopsutil/cpu" tui "github.com/gizak/termui/v3" - ui "github.com/xxxserxxx/gotop/termui" - "github.com/xxxserxxx/gotop/utils" + ui "github.com/xxxserxxx/gotop/v3/termui" + "github.com/xxxserxxx/gotop/v3/utils" ) const ( diff --git a/widgets/proc_freebsd.go b/widgets/proc_freebsd.go index ac3e73f..f703c03 100644 --- a/widgets/proc_freebsd.go +++ b/widgets/proc_freebsd.go @@ -8,7 +8,7 @@ import ( "strconv" "strings" - "github.com/xxxserxxx/gotop/utils" + "github.com/xxxserxxx/gotop/v3/utils" ) type processList struct { diff --git a/widgets/proc_other.go b/widgets/proc_other.go index 09aac28..d2a313f 100644 --- a/widgets/proc_other.go +++ b/widgets/proc_other.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/xxxserxxx/gotop/utils" + "github.com/xxxserxxx/gotop/v3/utils" ) const ( diff --git a/widgets/temp.go b/widgets/temp.go index a01853e..1b9f650 100644 --- a/widgets/temp.go +++ b/widgets/temp.go @@ -9,8 +9,8 @@ import ( ui "github.com/gizak/termui/v3" "github.com/prometheus/client_golang/prometheus" - "github.com/xxxserxxx/gotop/devices" - "github.com/xxxserxxx/gotop/utils" + "github.com/xxxserxxx/gotop/v3/devices" + "github.com/xxxserxxx/gotop/v3/utils" ) type TempScale rune