summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean E. Russell <ser@ser1.net>2020-03-06 07:29:23 -0600
committerSean E. Russell <ser@ser1.net>2020-03-06 07:29:23 -0600
commitf428d851d0a029e0cf2138bc7a5cdac4e6b45209 (patch)
tree3a9ea09669c9d7cb3aeddff581f66856764ed765
parent19d9b687f3c1144f46c610d82b807917be39c465 (diff)
Version bump for release
-rw-r--r--CHANGELOG.md6
-rw-r--r--README.md29
-rw-r--r--cmd/gotop/main.go2
3 files changed, 18 insertions, 19 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a489c8f..9e5b2dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,7 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
> - **Fixed**: for any bug fixes.
> - **Security**: in case of vulnerabilities.
-## [3.4.5] - ??
+## [3.5.0] - 2020-03-06
+
+The version jump from 3.3.x is due to some work in the build automation that necessitated a number of bumps to test the build/release, and testing compiling plugins from github repositories.
### Added
@@ -24,7 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Temp widget displays degree symbol (merged from BartWillems, thanks
also fleaz)
- Support for (device) plugins, and abstracting devices from widgets. This
- allows adding functionality without adding bulk.
+ allows adding functionality without adding bulk. See the [plugins decision wiki section](https://github.com/xxxserxxx/gotop/wiki/Plugins-in-gotop) for more information.
### Fixed
diff --git a/README.md b/README.md
index 432188b..0c18b38 100644
--- a/README.md
+++ b/README.md
@@ -29,6 +29,12 @@ AUR contains entries for `gotop` and `gotop-bin`. `gotop-git` still points at t
yay -S gotop-bin
```
+There is also a build-from-source package:
+
+```
+yay -S gotop
+```
+
### OSX
gotop can be installed with [Homebrew](https://brew.sh/); you'll need to tap the recipe. If you'd previously tapped cjbassi's recipe, you'll want to untap that first. The old version of gotop is also included in Homebrew's core library, and that will always be chosen before any taps, so you have to specify the tap specifically.
@@ -44,42 +50,33 @@ brew install xxxserxxx/gotop
This doesn't require Go, is easy, and works across distributions. You have to manually upgrade the executable yourself, though, so using your distribution's package (if one is available) is a better approach.
-Visit [the releases page](https://github.com/xxxserxxx/gotop/releases) with your web browser and download the appropriate file for your OS. Unzip it (the archive contains a single file) and then move the resulting `gotop` binary into your `$PATH` somewhere. If you're on a Debian or Redhat derivative, you can download an `.rpm` or `.deb` and install that.
+Visit [the releases page](https://github.com/xxxserxxx/gotop/releases) with your web browser and download the appropriate file for your OS and architecture. Unzip it (the archive contains a single file) and then move the resulting `gotop` binary into your `$PATH` somewhere. If you're on a Debian or Redhat derivative, you can download an `.rpm` or `.deb` and install that.
### Source
-This requires Go, and at the moment, Go 1.14 specifically.
+This requires Go, and at the moment, Go 1.14 specifically.
```bash
go get -u github.com/xxxserxxx/gotop/cmd/gotop
```
+If you don't have Go 1.14, you will want to follow the Building instructions in the next section.
+
### Building
This is the download & compile approach.
+gotop should build with most versions of Go. If you have a version other than 1.14 installed, remove the `go` line at the end of `go.mod`.
+
```
git clone https://github.com/xxxserxxx/gotop.git
cd gotop
+sed -i '/^go/d' go.mod # Do this if you have go != 1.14
go build -o gotop ./cmd/gotop
```
Move `gotop` to somewhere in your `$PATH`.
-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.
-
-- bash
-- Go
-- zip
-- nfpm (for deb & rpm)
-- docker (for darwin)
-
-It is *just* smart enough to not rebuild things when it doesn't have to, and it tries to keep the darwin docker container around so it's not building from scratch every time. There are no guarantees.
-
-#### Note
-
-`make.sh` will probably go away soon as the project has shifted to using the github workflow engine to do builds.
-
## Usage
### Keybinds
diff --git a/cmd/gotop/main.go b/cmd/gotop/main.go
index 24e6724..68327f1 100644
--- a/cmd/gotop/main.go
+++ b/cmd/gotop/main.go
@@ -38,7 +38,7 @@ const (
var (
// TODO: Set this at compile time; having to check this in sucks.
- Version = "3.4.5"
+ Version = "3.5.0"
conf gotop.Config
help *w.HelpMenu
bar *w.StatusBar