summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClementTsang <clementjhtsang@gmail.com>2020-02-22 00:41:55 -0500
committerClementTsang <clementjhtsang@gmail.com>2020-02-22 00:42:52 -0500
commit8ebe8431282fc814b5ab58511277b17f29a6ca6b (patch)
treeff33a29311c2a4236a3e8959a80f1bb84ebc3c8d
parent1cf67c6dbd5fc2c13803dd6622c81baa82854d6f (diff)
Some doc stuff and edit travis.
-rw-r--r--.travis.yml31
-rw-r--r--Cargo.toml2
-rw-r--r--README.md4
3 files changed, 24 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index eb6a710f..c73271cf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,22 +47,29 @@ notifications:
before_deploy:
- |
if [[ $TRAVIS_OS_NAME == "windows" ]]; then
- export TARGET=x86_64-pc-windows-msvc;
- cargo build --release --target $TARGET;
- cp ./target/x86_64-pc-windows-msvc/release/btm btm.exe;
- strip btm.exe;
- cp sample_configs/bottom.toml bottom.toml;
- tar -czvf bottom_x86_64-pc-windows-msvc.tar.gz btm.exe bottom.toml;
+ rustup target add x86_64-pc-windows-msvc;
+ cargo build --release --target x86_64-pc-windows-msvc;
+ strip ./target/x86_64-pc-windows-msvc/release/btm;
+ mv ./target/x86_64-pc-windows-msvc/release/btm ./target/x86_64-pc-windows-msvc/release/btm.exe;
+ zip -r bottom_x86_64-pc-windows-msvc.zip ./target/x86_64-pc-windows-msvc/release/btm.exe;
+ rustup target add i686-pc-windows-msvc;
+ cargo build --release --target i686-pc-windows-msvc;
+ strip ./target/i686-pc-windows-msvc/release/btm;
+ mv ./target/i686-pc-windows-msvc/release/btm ./target/i686-pc-windows-msvc/release/btm.exe;
+ zip -r bottom_i686-pc-windows-msvc.zip ./target/i686-pc-windows-msvc/release/btm.exe;
else
cargo build --release;
cp ./target/release/btm btm;
strip btm;
- cp sample_configs/bottom.toml bottom.toml;
if [[ $TRAVIS_OS_NAME == "linux" ]]; then
- tar -czvf bottom_x86_64-unknown-linux-gnu.tar.gz btm bottom.toml;
- tar -czvf bottom_source_code.tar.gz ./src ./Cargo.toml LICENSE tests bottom.toml;
+ tar -czvf bottom_x86_64-unknown-linux-gnu.tar.gz btm;
+ rustup target add i686-unknown-linux-gnu;
+ cargo build --release --target i686-unknown-linux-gnu;
+ strip ./target/i686-unknown-linux-gnu/release/btm;
+ tar -czvf bottom_i686-unknown-linux-gnu.tar.gz ./target/i686-unknown-linux-gnu/release/btm;
+ tar -czvf bottom_source_code.tar.gz ./src ./Cargo.toml LICENSE tests;
elif [[ $TRAVIS_OS_NAME == "osx" ]]; then
- tar -czvf bottom_x86_64-apple-darwin.tar.gz btm bottom.toml;
+ tar -czvf bottom_x86_64-apple-darwin.tar.gz btm;
fi
fi
@@ -72,7 +79,9 @@ deploy:
api_key:
secure: ppBn0DnqZ+Rzb84doZQxYdUBQ0rVrZNIiH6ZSFEiCVJd0ttqXfOjK/qXbIf/zabwO0Olqz18jwd9piHjNigWRrHwX9N+YH0DZTM3f4WS2/2acvOP3AjSw6oERjYTwS5yKe/XP1sU11uL6O0oAxYFeiAkn7QOM7flVUE2BmmLAs2lLtQ+9ylmUeBGatrkTfQ0Z2i1o7p5mtI2fKUozpImtHq8TClQEsF4oQS5nvkHtpLuPQ0UrJ8vKZijDBeMuLbDkR121ujRnjoBt8+eXBRbwzAvVotwRozyol8noAN3i4VvYueId6oX7Y2DSEp26wnCuRXGurUnyya5JE55AKoevK+SUHRe5+29/2lPbC5d/etZt2tSX1AIJk9fHeIfRPSTzanIIyDpUzSGoMKjl1ARKGrgHYehRxMKpW0cC2xHSlQ+NrA5apLpXKr2IzpkGsxpAxLqRASbX2VJYCEL70WoJfXinZrxeDxXsaWBLGaj9ySyk059GZBMz9GBdYNtwF3G/3aSIt0nkEGgKipgYXHi5keKKGmyfeZyYkRJRbc369JRZiHuOWct+1ZsOdrKKdbyAdcDGj5kbKuYwA6E+wgI62IWvUTm+vtKDuIbLpu/48aOUuEslGHkYAszLTapX/Le9c9XTu3L+PMgkPq2LSyaeGrfnM+DE/Hwe3Jvurccp94=
file_glob: true
- file: bottom_*.tar.gz
+ file:
+ - bottom_*.tar.gz
+ - bottom_*.zip
skip_cleanup: true
on:
tags: true
diff --git a/Cargo.toml b/Cargo.toml
index 593efeaa..51dd3c62 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.2.1"
authors = ["Clement Tsang <cjhtsang@uwaterloo.ca>"]
edition = "2018"
repository = "https://github.com/ClementTsang/bottom"
-keywords = ["linux", "macos", "windows", "cli", "monitoring-tool", "top", "bottom", "graphical"]
+keywords = ["linux", "macos", "windows", "cli", "monitoring-tool", "top", "bottom", "tui"]
license = "MIT"
categories = ["command-line-utilities", "visualization"]
description = "A graphical top clone, written in Rust. Inspired by both gtop and gotop. Supports Linux, macOS, and Windows."
diff --git a/README.md b/README.md
index 71d82c32..920ad8c8 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
[![Build Status](https://travis-ci.com/ClementTsang/bottom.svg?token=1wvzVgp94E1TZyPNs8JF&branch=master)](https://travis-ci.com/ClementTsang/bottom) [![crates.io link](https://img.shields.io/crates/v/bottom.svg)](https://crates.io/crates/bottom)
-A cross-platform graphical process/system monitor. Inspired by both [gtop](https://github.com/aksakalli/gtop) and [gotop](https://github.com/cjbassi/gotop). Supports Linux, macOS, and Windows.
+A cross-platform graphical process/system monitor with a customizable interface and a multitude of features. Supports Linux, macOS, and Windows. Inspired by both [gtop](https://github.com/aksakalli/gtop) and [gotop](https://github.com/cjbassi/gotop).
![Quick demo recording showing off searching, maximizing, and process killing.](assets/summary_and_search.gif) _Terminal: Kitty Terminal, Font: IBM Plex Mono, OS: Arch Linux. Theme based on [gruvbox](https://github.com/morhetz/gruvbox) (see [sample config](./sample_configs/demo_config.toml))._
@@ -38,6 +38,8 @@ For information about config files, see [this document](./docs/config.md) for mo
In all cases you can install the in-development version by cloning and using `cargo build --release`. Note this is built and tested with Rust Stable (1.41.0 as of writing). You can also get release versions using `cargo install bottom`, or manually building from the [Releases](https://github.com/ClementTsang/bottom/releases) page by downloading and building.
+I officially support and test 64-bit variants. I will also build and release 32-bit variants for Linux and Windows, but I'm (currently) not testing whether they work.
+
### Linux
Other installation methods based on distros are as follows: