Compare commits

...

12 Commits

Author SHA1 Message Date
Jakob P. Liljenberg 60f95a1a74
Update README.md 2022-01-13 16:54:23 +01:00
aristocratos 4bf71e6816
Merge pull request #181 from lwhsu/freebsd
Update FreeBSD install instructions
2020-08-10 18:05:06 +02:00
aristocratos e7648ffdad
Merge pull request #184 from wigust/guix
Added install instructions for Guix
2020-08-10 18:02:59 +02:00
Oleg Pykhalov 9a0e464188
Added install instructions for Guix 2020-08-10 18:56:37 +03:00
Li-Wen Hsu 2725b77917
Update FreeBSD install instructions 2020-08-08 22:42:17 +08:00
aristocratos 9f8a133493 Get bpytop! 2020-08-07 14:50:37 +02:00
aristocratos d2eb76ea5b Added links to bpytop 2020-08-02 20:30:40 +02:00
aristocratos 89bf185f6b
Merge pull request #175 from elboletaire/master
Remove extra space in debian prerm script
2020-07-22 13:12:01 +02:00
Òscar Casajuana ae8d7a9266
Remove extra space 2020-07-22 12:00:45 +02:00
aristocratos 071cde4a9c Added info for bug fixing [skip ci] 2020-07-20 12:44:54 +02:00
aristocratos c76573ac7d v0.9.25 Fix for crash on linux when 9p filesystem is present 2020-07-20 12:35:57 +02:00
Josh faaf3ca047
ignore 9p filesystems to fix hang on Crostini
This patch prevents bashtop from hanging when running in a Crostini container.  Crostini (Linux containers on ChromeOS) use the 9P filesystem for communication between various VMs and containers.
2020-07-19 03:04:46 -05:00
6 changed files with 43 additions and 14 deletions

View File

@ -1,5 +1,9 @@
# Changelog
## v0.9.25
* Fixed: Crash when using "/proc" data collection and filesystem type is 9p, by @bolapara
## v0.9.24
* Fixed: Psutil script crash on OSX

View File

@ -6,6 +6,8 @@
* Is it a requested change or feature?
* If not, open a feature request to get feedback before making a pull request.
* If it's a fix for a unreported bug, make a bug report and link the pull request.
* Split up multiple unrelated changes in multiple pull requests.
* [Shellcheck](https://github.com/koalaman/shellcheck) your work. Current shellsheck exceptions at the beginning of [bashtop](bashtop).

View File

@ -1,4 +1,4 @@
#!/bin/bash
echo -e "[\033[1;33m removing packet from the system \033[0m]"
echo -e "[\033[1;33m removing packet from the system \033[0m]"

BIN
Imgs/bpytop.png Executable file

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

View File

@ -12,13 +12,24 @@
[![Sponsor](https://img.shields.io/badge/-Sponsor-red?logo=github)](https://github.com/sponsors/aristocratos)
[![Coffee](https://img.shields.io/badge/-Buy%20me%20a%20Coffee-grey?logo=Ko-fi)](https://ko-fi.com/aristocratos)
### C++ Version
##### 18 September 2021
![btop++](https://raw.githubusercontent.com/aristocratos/btop/main/Img/logo.png)
The C++ version of bashtop - btop++ is available.
Get it at https://github.com/aristocratos/btop
#
## Index
* [Documents](#documents)
* [Description](#description)
* [Features](#features)
* [Themes](#themes)
* [Upcoming](#upcoming) (Python port)
* [Support and funding](#support-and-funding)
* [Prerequisites](#prerequisites)
* [Dependencies](#dependencies)
@ -28,6 +39,7 @@
* [TODO](#todo)
* [License](#license)
## Documents
#### [CHANGELOG.md](CHANGELOG.md)
@ -65,13 +77,6 @@ User created themes should be placed in `$HOME/.config/bashtop/user_themes` to b
Let me know if you want to contribute with new themes.
## Upcoming
#### Python port: bpytop
Currently working full time on this during my vacation :)
I'm aiming to have a first release by end of July.
## Support and funding
Bug fixes and updates might be slow during normal workdays since I work full time as an industrial worker and don't have much time or energy left during the week.
@ -203,9 +208,7 @@ brew install osx-cpu-temp
>Install with pkg and pip
``` bash
sudo pkg install coreutils gsed python3 git
sudo python3 -m ensurepip
sudo pip3 install psutil
sudo pkg install coreutils gsed git py37-psutil
```
#### Manual installation Linux, OSX and FreeBSD
@ -224,6 +227,16 @@ sudo make install
sudo make uninstall
```
#### FreeBSD package
Available in [FreeBSD ports](https://www.freshports.org/sysutils/bashtop/)
Install pre-built pacakge
``` bash
sudo pkg install bashtop
```
#### Arch based
Available in the AUR as [bashtop-git](https://aur.archlinux.org/packages/bashtop-git/)
@ -250,6 +263,16 @@ Or use quick installation:
sudo ./build --remove
```
#### Guix based
Available in [official Guix repository](https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/admin.scm) since 6bbd0fd2
>Installation
``` bash
guix install bashtop
```
#### Ubuntu based
Available in [official Ubuntu repository](https://launchpad.net/ubuntu/+source/bashtop) since Ubuntu 20.10

View File

@ -93,7 +93,7 @@ banner=(
"██╔══██╗██╔══██║╚════██║██╔══██║ ██║ ██║ ██║██╔═══╝ "
"██████╔╝██║ ██║███████║██║ ██║ ██║ ╚██████╔╝██║ "
"╚═════╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ")
declare version="0.9.24"
declare version="0.9.25"
#* Get latest version of BashTOP from https://github.com/aristocratos/bashtop
@ -2235,7 +2235,7 @@ collect_mem() { #? Collect memory information from "/proc/meminfo"
if ! py_command -a df_array "get_disks(exclude='squashfs'${filtering})"; then psutil_disk_fail=1; psutil_on="false"; fi
fi
if [[ $psutil_on == false ]]; then
readarray -t df_array < <(${df} -x squashfs -x tmpfs -x devtmpfs -x overlay 2>/dev/null || true)
readarray -t df_array < <(${df} -x squashfs -x tmpfs -x devtmpfs -x overlay -x 9p 2>/dev/null || true)
fi
for df_line in "${df_array[@]:1}"; do
line_array=(${df_line})