diff options
| author | Sean E. Russell <ser@ser1.net> | 2020-03-03 05:47:52 -0600 |
|---|---|---|
| committer | Sean E. Russell <ser@ser1.net> | 2020-03-03 05:47:52 -0600 |
| commit | 9f67cdf7730d68b054a7897c4e937d2fcfb0e1ad (patch) | |
| tree | 8637d3e1f31fe9fb72a859f990b1bd754ffcb83b | |
| parent | 8642e94d90460650bbd35ab6eccced0d22050797 (diff) | |
Change Version so it can be set at compile time. @extensions
| -rw-r--r-- | cmd/gotop/main.go | 7 | ||||
| -rw-r--r-- | devices/cpu.go | 2 | ||||
| -rw-r--r-- | docs/releasing.md | 12 |
3 files changed, 17 insertions, 4 deletions
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go index 4ce78ba..f6b6dfc 100644 --- a/cmd/gotop/main.go +++ b/cmd/gotop/main.go @@ -28,8 +28,6 @@ import ( const ( appName = "gotop" - // TODO: Set this at compile time; having to check this in sucks. - version = "3.4.5" graphHorizontalScaleDelta = 3 defaultUI = "cpu\ndisk/1 2:mem/2\ntemp\nnet procs" @@ -39,6 +37,8 @@ const ( ) var ( + // TODO: Set this at compile time; having to check this in sucks. + Version = "3.4.5" conf gotop.Config help *w.HelpMenu bar *w.StatusBar @@ -50,7 +50,6 @@ var ( // TODO: state:merge #135 linux console font (cmatsuoka/console-font) // TODO: state:deferred 157 FreeBSD fixes & Nvidia GPU support (kraust/master). Significant CPU use impact for NVidia changes. // TODO: Virtual devices from Prometeus metrics @feature -// TODO: state:merge #167 configuration file (jrswab/configFile111) // TODO: Abstract out the UI toolkit. mum4k/termdash, VladimirMarkelov/clui, gcla/gowid, rivo/tview, marcusolsson/tui-go might work better for some OS/Archs. Performance/memory use comparison would be interesting. func parseArgs(conf *gotop.Config) error { usage := ` @@ -97,7 +96,7 @@ Colorschemes: return err } - args, err := docopt.ParseArgs(usage, os.Args[1:], version) + args, err := docopt.ParseArgs(usage, os.Args[1:], Version) if err != nil { return err } diff --git a/devices/cpu.go b/devices/cpu.go index 436ccb1..1d8d23d 100644 --- a/devices/cpu.go +++ b/devices/cpu.go @@ -1,5 +1,7 @@ package devices +// TODO: https://github.com/elastic/go-sysinfo + import ( "log" "time" diff --git a/docs/releasing.md b/docs/releasing.md index 643bc9f..4c6583c 100644 --- a/docs/releasing.md +++ b/docs/releasing.md @@ -14,3 +14,15 @@ credentials to aurpublish to the AUR repository, so the final publish step is still currently manual. Oh, what a tangled web. + + +Nix adds new and interesting complexities to the release. + +1. cd to the nixpkgs directory +2. docker run -it --rm --mount type=bind,source="\$(pwd)",target=/mnt nixos/nix sh +3. cd /mnt +4. nix-prefetch-url --unpack https://github.com/xxxserxxx/gotop/archive/v3.3.2.tar.gz +5. Copy the sha256 +6. Update the version and hash in nixpkgs/pkgs/tools/system/gotop/default.nix +8. In docker, install & run vgo2nix to update deps.nix +7. nix-build -A gotop |