"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "bashtop" between
bashtop-0.9.24.tar.gz and bashtop-0.9.25.tar.gz

About: Bashtop is a resource monitor that shows usage and stats for processor, memory, disks, network and processes.

bashtop  (bashtop-0.9.24):bashtop  (bashtop-0.9.25)
skipping to change at line 95 skipping to change at line 95
declare -a banner banner_colors declare -a banner banner_colors
banner=( banner=(
"██████╗ █████╗ ███████╗██╗ ██╗████████╗ ██████╗ ██████╗ " "██████╗ █████╗ ███████╗██╗ ██╗████████╗ ██████╗ ██████╗ "
"██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██╔═══██╗██╔══██╗" "██╔══██╗██╔══██╗██╔════╝██║ ██║╚══██╔══╝██╔═══██╗██╔══██╗"
"██████╔╝███████║███████╗███████║ ██║ ██║ ██║██████╔╝" "██████╔╝███████║███████╗███████║ ██║ ██║ ██║██████╔╝"
"██╔══██╗██╔══██║╚════██║██╔══██║ ██║ ██║ ██║██╔═══╝ " "██╔══██╗██╔══██║╚════██║██╔══██║ ██║ ██║ ██║██╔═══╝ "
"██████╔╝██║ ██║███████║██║ ██║ ██║ ╚██████╔╝██║ " "██████╔╝██║ ██║███████║██║ ██║ ██║ ╚██████╔╝██║ "
"╚═════╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ") "╚═════╝ ╚═╝ ╚═╝╚══════╝╚═╝ ╚═╝ ╚═╝ ╚═════╝ ╚═╝ ")
declare version="0.9.24" declare version="0.9.25"
#* Get latest version of BashTOP from https://github.com/aristocratos/bashtop #* Get latest version of BashTOP from https://github.com/aristocratos/bashtop
declare banner_width=${#banner[0]} declare banner_width=${#banner[0]}
banner_colors=("#E62525" "#CD2121" "#B31D1D" "#9A1919" "#801414") banner_colors=("#E62525" "#CD2121" "#B31D1D" "#9A1919" "#801414")
#* Set correct names for GNU tools depending on OS #* Set correct names for GNU tools depending on OS
if [[ $system != "Linux" ]]; then tool_prefix="g"; fi if [[ $system != "Linux" ]]; then tool_prefix="g"; fi
for tool in "dd" "df" "stty" "tail" "realpath" "wc" "rm" "mv" "sleep" "stdbuf" " mkfifo" "date" "kill" "sed"; do for tool in "dd" "df" "stty" "tail" "realpath" "wc" "rm" "mv" "sleep" "stdbuf" " mkfifo" "date" "kill" "sed"; do
declare -n set_tool="${tool}" declare -n set_tool="${tool}"
skipping to change at line 2226 skipping to change at line 2226
#* Get disk information #* Get disk information
local df_line line_array dev_path dev_name iostat_var disk_read disk_writ e disk_io_string df_count=0 filtering psutil_on local df_line line_array dev_path dev_name iostat_var disk_read disk_writ e disk_io_string df_count=0 filtering psutil_on
local -a device_array iostat_array df_array local -a device_array iostat_array df_array
unset 'disks_free[@]' 'disks_used[@]' 'disks_used_percent[@]' 'disks_tota l[@]' 'disks_name[@]' 'disks_free_percent[@]' 'disks_io[@]' unset 'disks_free[@]' 'disks_used[@]' 'disks_used_percent[@]' 'disks_tota l[@]' 'disks_name[@]' 'disks_free_percent[@]' 'disks_io[@]'
if [[ -n $psutil_disk_fail ]]; then psutil_on="false"; else psutil_on="$u se_psutil"; fi if [[ -n $psutil_disk_fail ]]; then psutil_on="false"; else psutil_on="$u se_psutil"; fi
if [[ $psutil_on == true ]]; then if [[ $psutil_on == true ]]; then
if [[ -n $disks_filter ]]; then filtering=", filtering='${disks_f ilter}'"; fi if [[ -n $disks_filter ]]; then filtering=", filtering='${disks_f ilter}'"; fi
if ! py_command -a df_array "get_disks(exclude='squashfs'${filter ing})"; then psutil_disk_fail=1; psutil_on="false"; fi if ! py_command -a df_array "get_disks(exclude='squashfs'${filter ing})"; then psutil_disk_fail=1; psutil_on="false"; fi
fi fi
if [[ $psutil_on == false ]]; then 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 fi
for df_line in "${df_array[@]:1}"; do for df_line in "${df_array[@]:1}"; do
line_array=(${df_line}) line_array=(${df_line})
if ! is_int "${line_array[1]}" || ((line_array[1]<=0)); then cont inue; fi if ! is_int "${line_array[1]}" || ((line_array[1]<=0)); then cont inue; fi
if [[ $psutil_on == false && ${line_array[5]} == "/" ]]; then dis ks_name+=("root") if [[ $psutil_on == false && ${line_array[5]} == "/" ]]; then dis ks_name+=("root")
elif [[ $psutil_on == false ]]; then disks_name+=("${line_array[5 ]##*/}") elif [[ $psutil_on == false ]]; then disks_name+=("${line_array[5 ]##*/}")
elif [[ $psutil_on == true ]]; then disks_name+=("${line_array[*] :7}"); fi elif [[ $psutil_on == true ]]; then disks_name+=("${line_array[*] :7}"); fi
#* Filter disks showed if $disks_filter is set #* Filter disks showed if $disks_filter is set
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)