From d142efe2db37a12fb8f540562e06332995b11fac Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 10:12:21 +1100 Subject: [PATCH 01/27] Added base support for progress bars --- 1.4.md | 6 ++++++ README.md | 6 ++++++ config/config | 15 +++++++++++++++ neofetch | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 74 insertions(+) diff --git a/1.4.md b/1.4.md index 601f3fe7..19ae5bb5 100644 --- a/1.4.md +++ b/1.4.md @@ -8,6 +8,12 @@ ### Info +- Added the ability to print certain info as a progress bar. +- Added `--progress_char` and `$progress_char` to set the character the progress bars
+will be drawn with. +- Added `--progress_colors` to color the progress bars. +- Added `$progress_color_elapsed` and `$progress_color_total` config options. + **Battery**
- Added support for NetBSD diff --git a/README.md b/README.md index 5e7c19c4..2308ac34 100644 --- a/README.md +++ b/README.md @@ -280,6 +280,12 @@ alias fetch2="fetch \ --block_range start end Range of colors to print as blocks + Progress Bars: + --progress_char char Character to use when drawing progress bars. + --progress_colors num num Colors to make the progress bar. Set in this order: + elapsed, total + + Image: --image type Image source. Where and what image we display. Possible values: wall, shuffle, ascii, diff --git a/config/config b/config/config index 71b2f723..bd389ac3 100644 --- a/config/config +++ b/config/config @@ -215,6 +215,21 @@ underline_char="-" prompt_height=1 +# }}} + +# Progress Bars {{{ + + +# Progress bar character +# --progress_char char +progress_char="━" + +# Progress bar colors +# --progress_colors col col +progress_color_elapsed="6" +progress_color_total="8" + + # }}} # Image Options {{{ diff --git a/neofetch b/neofetch index eff8fe14..29aa81ef 100755 --- a/neofetch +++ b/neofetch @@ -235,6 +235,21 @@ underline_char="-" prompt_height=1 +# }}} + +# Progress Bars {{{ + + +# Progress bar character +# --progress_char char +progress_char="━" + +# Progress bar colors +# --progress_colors col col +progress_color_elapsed="6" +progress_color_total="8" + + # }}} # Image Options {{{ @@ -2227,6 +2242,25 @@ esac # }}} +# Progress Bars {{{ + +bar() { + # Get the values + percent="$1" + length="$2" + inc=$((percent * length / 100)) + + # Create the bar with spaces + prog=$(printf %"$inc"s) + total=$(printf %"$((length - inc))"s) + + # Set the colors and swap the spaces for $progress_char + bar="\033[38;5;${progress_color_elapsed}m${prog// /$progress_char}" + bar+="\033[38;5;${progress_color_total}m${total// /$progress_char}" + printf "%b%s\n" "${bar}${clear}" +} + +# }}} # }}} @@ -2284,6 +2318,12 @@ usage () { cat << EOF --block_range start end Range of colors to print as blocks + Progress Bars: + --progress_char char Character to use when drawing progress bars. + --progress_colors num num Colors to make the progress bar. Set in this order: + elapsed, total + + Image: --image type Image source. Where and what image we display. Possible values: wall, shuffle, ascii, @@ -2397,6 +2437,13 @@ while [ "$1" ]; do --block_range) start=$2; end=$3 ;; --block_width) block_width="$2" ;; + # Progress Bars + --progress_char) progress_char="$2" ;; + --progress_colors) + progress_color_elapsed="$2" + progress_color_total="$3" + ;; + # Image --image) image="$2" From da5d912774aba783d25aee04dc05e8d2d8669062 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 10:37:18 +1100 Subject: [PATCH 02/27] Added new info function 'cpu usage' to get the cpu usage --- config/config | 8 ++++++++ neofetch | 30 ++++++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/config/config b/config/config index bd389ac3..f57730c8 100644 --- a/config/config +++ b/config/config @@ -224,11 +224,19 @@ prompt_height=1 # --progress_char char progress_char="━" +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# --progress_length num +progress_length="15" + # Progress bar colors # --progress_colors col col progress_color_elapsed="6" progress_color_total="8" +# Cpu Usage progress bar +cpu_usage_bar="on" + # }}} diff --git a/neofetch b/neofetch index 29aa81ef..c36d6d23 100755 --- a/neofetch +++ b/neofetch @@ -63,6 +63,8 @@ printinfo () { # info "Users" users # info "Birthday" birthday + # info "CPU Usage" cpu_usage + info linebreak info cols info linebreak @@ -244,11 +246,19 @@ prompt_height=1 # --progress_char char progress_char="━" +# Progress bar length in spaces +# Number of chars long to make the progress bars. +# --progress_length num +progress_length="15" + # Progress bar colors # --progress_colors col col progress_color_elapsed="6" progress_color_total="8" +# Cpu Usage progress bar +cpu_usage_bar="on" + # }}} @@ -1583,6 +1593,18 @@ getcols () { # }}} +# CPU Usage {{{ + +getcpu_usage () { + cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" + cpu_usage="${cpu_usage/\.*}%" + + [ "$cpu_usage_bar" == "on" ] && \ + cpu_usage+=" $(bar "${cpu_usage/'%'}")" +} + + +# }}} # }}} @@ -2247,12 +2269,11 @@ esac bar() { # Get the values percent="$1" - length="$2" - inc=$((percent * length / 100)) + elapsed=$((percent * progress_length / 100)) # Create the bar with spaces - prog=$(printf %"$inc"s) - total=$(printf %"$((length - inc))"s) + prog=$(printf %"$elapsed"s) + total=$(printf %"$((progress_length - elapsed))"s) # Set the colors and swap the spaces for $progress_char bar="\033[38;5;${progress_color_elapsed}m${prog// /$progress_char}" @@ -2439,6 +2460,7 @@ while [ "$1" ]; do # Progress Bars --progress_char) progress_char="$2" ;; + --progress_length) progress_length="$2" ;; --progress_colors) progress_color_elapsed="$2" progress_color_total="$3" From 639641a1599384a7ddb8942a0c0daa05af612a54 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 10:41:13 +1100 Subject: [PATCH 03/27] Changelog --- 1.4.md | 6 ++++++ README.md | 2 ++ neofetch | 2 ++ 3 files changed, 10 insertions(+) diff --git a/1.4.md b/1.4.md index 19ae5bb5..813905f3 100644 --- a/1.4.md +++ b/1.4.md @@ -11,9 +11,15 @@ - Added the ability to print certain info as a progress bar. - Added `--progress_char` and `$progress_char` to set the character the progress bars
will be drawn with. +- Added `--progress_length` to change the length of the progress bars. - Added `--progress_colors` to color the progress bars. - Added `$progress_color_elapsed` and `$progress_color_total` config options. +**CPU Usage**
+- Added `cpu_usage` function which prints your current cpu usage. +- Added `--cpu_usage_bar` and `$cpu_usage_bar` to enable/disable displaying a progress
+bar in the output. + **Battery**
- Added support for NetBSD diff --git a/README.md b/README.md index 2308ac34..004068ec 100644 --- a/README.md +++ b/README.md @@ -282,8 +282,10 @@ alias fetch2="fetch \ Progress Bars: --progress_char char Character to use when drawing progress bars. + --progress_length num Length in spaces to make the progress bars. --progress_colors num num Colors to make the progress bar. Set in this order: elapsed, total + --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. Image: diff --git a/neofetch b/neofetch index c36d6d23..a9255e22 100755 --- a/neofetch +++ b/neofetch @@ -2341,8 +2341,10 @@ usage () { cat << EOF Progress Bars: --progress_char char Character to use when drawing progress bars. + --progress_length num Length in spaces to make the progress bars. --progress_colors num num Colors to make the progress bar. Set in this order: elapsed, total + --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. Image: From f24f7ad9b7f7854169ca76779bb251be1d2ca4c1 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:00:47 +1100 Subject: [PATCH 04/27] Added progress bar support to memory output --- 1.4.md | 4 ++++ README.md | 1 + config/config | 5 ++++- neofetch | 13 ++++++++++--- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/1.4.md b/1.4.md index 813905f3..2df717c5 100644 --- a/1.4.md +++ b/1.4.md @@ -20,6 +20,10 @@ will be drawn with. - Added `--cpu_usage_bar` and `$cpu_usage_bar` to enable/disable displaying a progress
bar in the output. +**Memory**
+- Added `--memory_bar` and `$memory_bar` to enable/disable displaying a progress bar in
+the output. + **Battery**
- Added support for NetBSD diff --git a/README.md b/README.md index 004068ec..8be3bfa3 100644 --- a/README.md +++ b/README.md @@ -286,6 +286,7 @@ alias fetch2="fetch \ --progress_colors num num Colors to make the progress bar. Set in this order: elapsed, total --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. + --memory_bar on/off Whether or not to print a progress bar for memory usage. Image: diff --git a/config/config b/config/config index f57730c8..244e353f 100644 --- a/config/config +++ b/config/config @@ -234,8 +234,11 @@ progress_length="15" progress_color_elapsed="6" progress_color_total="8" -# Cpu Usage progress bar +# Enable/Disable progress bars +# --cpu_usage_bar on/off +# --memory_bar on/off cpu_usage_bar="on" +memory_bar="on" # }}} diff --git a/neofetch b/neofetch index a9255e22..a39d21ba 100755 --- a/neofetch +++ b/neofetch @@ -256,8 +256,11 @@ progress_length="15" progress_color_elapsed="6" progress_color_total="8" -# Cpu Usage progress bar +# Enable/Disable progress bars +# --cpu_usage_bar on/off +# --memory_bar on/off cpu_usage_bar="on" +memory_bar="on" # }}} @@ -1071,6 +1074,9 @@ getmemory () { memory="Unknown" ;; esac + + [ "$memory_bar" == "on" ] && \ + memory+=" $(bar "$((memused / 100000))" "$((memtotal / 100000))")" } # }}} @@ -1600,7 +1606,7 @@ getcpu_usage () { cpu_usage="${cpu_usage/\.*}%" [ "$cpu_usage_bar" == "on" ] && \ - cpu_usage+=" $(bar "${cpu_usage/'%'}")" + cpu_usage+=" $(bar "${cpu_usage/'%'}" 100)" } @@ -2269,7 +2275,7 @@ esac bar() { # Get the values percent="$1" - elapsed=$((percent * progress_length / 100)) + elapsed=$((percent * progress_length / $2)) # Create the bar with spaces prog=$(printf %"$elapsed"s) @@ -2345,6 +2351,7 @@ usage () { cat << EOF --progress_colors num num Colors to make the progress bar. Set in this order: elapsed, total --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. + --memory_bar on/off Whether or not to print a progress bar for memory usage. Image: From 5c374d28a2e8d3dd96b5648e1d890247cbeca5f7 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:03:19 +1100 Subject: [PATCH 05/27] Add missing args --- neofetch | 2 ++ 1 file changed, 2 insertions(+) diff --git a/neofetch b/neofetch index a39d21ba..4b4ddffa 100755 --- a/neofetch +++ b/neofetch @@ -2474,6 +2474,8 @@ while [ "$1" ]; do progress_color_elapsed="$2" progress_color_total="$3" ;; + --cpu_usage_bar) cpu_usage_bar="$2" ;; + --memory_bar) memory_bar="$2" ;; # Image --image) From e3dc2b9a3803c0ce2e18260f0f85eee5043da650 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:09:40 +1100 Subject: [PATCH 06/27] Progress bar support for battery usage --- 1.4.md | 2 ++ README.md | 1 + config/config | 3 ++- neofetch | 8 +++++++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/1.4.md b/1.4.md index 2df717c5..f4fcd3b8 100644 --- a/1.4.md +++ b/1.4.md @@ -26,6 +26,8 @@ the output. **Battery**
- Added support for NetBSD +- Added `--battery_bar` and `$batter_bar` to enable/disable displaying a progress bar in
+the output. ### Ascii diff --git a/README.md b/README.md index 8be3bfa3..0a525b21 100644 --- a/README.md +++ b/README.md @@ -287,6 +287,7 @@ alias fetch2="fetch \ elapsed, total --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. --memory_bar on/off Whether or not to print a progress bar for memory usage. + --battery_bar on/off Whether or not to print a progress bar for battery usage. Image: diff --git a/config/config b/config/config index 244e353f..a5ace791 100644 --- a/config/config +++ b/config/config @@ -237,9 +237,10 @@ progress_color_total="8" # Enable/Disable progress bars # --cpu_usage_bar on/off # --memory_bar on/off +# --battery_bar on/off cpu_usage_bar="on" memory_bar="on" - +battery_bar="on" # }}} diff --git a/neofetch b/neofetch index 4b4ddffa..0e0226ff 100755 --- a/neofetch +++ b/neofetch @@ -259,9 +259,10 @@ progress_color_total="8" # Enable/Disable progress bars # --cpu_usage_bar on/off # --memory_bar on/off +# --battery_bar on/off cpu_usage_bar="on" memory_bar="on" - +battery_bar="on" # }}} @@ -1460,6 +1461,9 @@ getbattery () { battery+="%" ;; esac + + [ "$battery_bar" == "on" ] && \ + battery+=" $(bar ${battery/'%'} 100)" } # }}} @@ -2352,6 +2356,7 @@ usage () { cat << EOF elapsed, total --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. --memory_bar on/off Whether or not to print a progress bar for memory usage. + --battery_bar on/off Whether or not to print a progress bar for battery usage. Image: @@ -2476,6 +2481,7 @@ while [ "$1" ]; do ;; --cpu_usage_bar) cpu_usage_bar="$2" ;; --memory_bar) memory_bar="$2" ;; + --battery_bar) battery_bar="$2" ;; # Image --image) From 6dc4277b4fa916e8efe00378bd2381b0f791335c Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:18:28 +1100 Subject: [PATCH 07/27] Cleanup the battery function --- neofetch | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/neofetch b/neofetch index 0e0226ff..487a16ed 100755 --- a/neofetch +++ b/neofetch @@ -1408,18 +1408,16 @@ getbattery () { battery="${battery}%" else - # If there's only a single battery and it's battery 0, - # don't number the subtitle. - if [ "${#batteries[@]}" == 1 ]; then - battery="${batteries[0]}%" + if [ "${#batteries[@]}" -gt 1 ]; then + # Print each battery on a separate line. + for bat in "${batteries[@]}"; do + prin "${title}${index}: ${bat}%" + index=$((index + 1)) + done return fi - # Print each battery on a separate line. - for bat in "${batteries[@]}"; do - prin "${title}${index}: ${bat}%" - index=$((index + 1)) - done + battery="${batteries[0]}%" fi else battery="None" From a16e44645596442282e65db2dc41571189effde4 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:24:28 +1100 Subject: [PATCH 08/27] Add progress bar support for multi battery systems --- neofetch | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 487a16ed..7c409724 100755 --- a/neofetch +++ b/neofetch @@ -1411,7 +1411,13 @@ getbattery () { if [ "${#batteries[@]}" -gt 1 ]; then # Print each battery on a separate line. for bat in "${batteries[@]}"; do - prin "${title}${index}: ${bat}%" + battery="${title}${index}: ${bat}%" + + [ "$battery_bar" == "on" ] && \ + battery+=" $(bar $bat 100)" + + prin "$battery" + unset battery index=$((index + 1)) done return From 2c90455f3843450070dd5f5943372aadb758214e Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:28:30 +1100 Subject: [PATCH 09/27] Disable progress bars in stdout mode --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 7c409724..42a109c0 100755 --- a/neofetch +++ b/neofetch @@ -2536,6 +2536,7 @@ while [ "$1" ]; do # Stdout --stdout) unset info_color colors + unset -f bar case "$2" in "--"* | "") echo "--stdout requires at least one argument"; exit ;; *) shift; args=("$@"); config="off" stdout ;; From fe3e78d21173678c0886bffcd13debf07cf7c094 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:29:28 +1100 Subject: [PATCH 10/27] Disable progress bars by default --- config/config | 6 +++--- neofetch | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/config/config b/config/config index a5ace791..a79455e3 100644 --- a/config/config +++ b/config/config @@ -238,9 +238,9 @@ progress_color_total="8" # --cpu_usage_bar on/off # --memory_bar on/off # --battery_bar on/off -cpu_usage_bar="on" -memory_bar="on" -battery_bar="on" +cpu_usage_bar="off" +memory_bar="off" +battery_bar="off" # }}} diff --git a/neofetch b/neofetch index 42a109c0..60129981 100755 --- a/neofetch +++ b/neofetch @@ -260,9 +260,9 @@ progress_color_total="8" # --cpu_usage_bar on/off # --memory_bar on/off # --battery_bar on/off -cpu_usage_bar="on" -memory_bar="on" -battery_bar="on" +cpu_usage_bar="off" +memory_bar="off" +battery_bar="off" # }}} From ae144ceee851b3e463b9b72da9b0d2ce8857b40a Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:52:39 +1100 Subject: [PATCH 11/27] Added disk support to progress bars --- 1.4.md | 6 +++++- README.md | 1 + config/config | 2 ++ neofetch | 10 ++++++++++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/1.4.md b/1.4.md index f4fcd3b8..5e8eb969 100644 --- a/1.4.md +++ b/1.4.md @@ -26,7 +26,11 @@ the output. **Battery**
- Added support for NetBSD -- Added `--battery_bar` and `$batter_bar` to enable/disable displaying a progress bar in
+- Added `--battery_bar` and `$battery_bar` to enable/disable displaying a progress bar in
+the output. + +**Disk**:
+- Added `--disk_bar` and `$disk_bar` to enable/disable displaying a progress bar in
the output. ### Ascii diff --git a/README.md b/README.md index 0a525b21..84f9f8c5 100644 --- a/README.md +++ b/README.md @@ -288,6 +288,7 @@ alias fetch2="fetch \ --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. --memory_bar on/off Whether or not to print a progress bar for memory usage. --battery_bar on/off Whether or not to print a progress bar for battery usage. + --disk_bar on/off Whether or not to print a progress bar for disk usage. Image: diff --git a/config/config b/config/config index a79455e3..ecf361b7 100644 --- a/config/config +++ b/config/config @@ -238,9 +238,11 @@ progress_color_total="8" # --cpu_usage_bar on/off # --memory_bar on/off # --battery_bar on/off +# --disk_bar on/off cpu_usage_bar="off" memory_bar="off" battery_bar="off" +disk_bar="off" # }}} diff --git a/neofetch b/neofetch index 60129981..6188f9dd 100755 --- a/neofetch +++ b/neofetch @@ -260,9 +260,11 @@ progress_color_total="8" # --cpu_usage_bar on/off # --memory_bar on/off # --battery_bar on/off +# --disk_bar on/off cpu_usage_bar="off" memory_bar="off" battery_bar="off" +disk_bar="off" # }}} @@ -1379,6 +1381,12 @@ getdisk () { # Put it all together disk="${disk_used} / ${disk_total} (${disk_total_per})" + + if [ "$disk_bar" == "on" ]; then + disk_used=${disk_used/T} + disk_total=${disk_total/T} + disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" + fi } # }}} @@ -2361,6 +2369,7 @@ usage () { cat << EOF --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. --memory_bar on/off Whether or not to print a progress bar for memory usage. --battery_bar on/off Whether or not to print a progress bar for battery usage. + --disk_bar on/off Whether or not to print a progress bar for disk usage. Image: @@ -2486,6 +2495,7 @@ while [ "$1" ]; do --cpu_usage_bar) cpu_usage_bar="$2" ;; --memory_bar) memory_bar="$2" ;; --battery_bar) battery_bar="$2" ;; + --disk_bar) disk_bar="$2" ;; # Image --image) From c2f4f04c9b6b6e1bbd9f335f9ea6639bd3651bfa Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 11:59:34 +1100 Subject: [PATCH 12/27] Changelog --- 1.4.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/1.4.md b/1.4.md index 5e8eb969..71e59040 100644 --- a/1.4.md +++ b/1.4.md @@ -8,7 +8,10 @@ ### Info -- Added the ability to print certain info as a progress bar. +**Added the ability to print certain info as a progress bar.** + +![1](https://cloud.githubusercontent.com/assets/6799467/13480732/04873af6-e134-11e5-9027-f8b120f58008.png) + - Added `--progress_char` and `$progress_char` to set the character the progress bars
will be drawn with. - Added `--progress_length` to change the length of the progress bars. From b587c3f7c90dd99598012a40ac87b3338df4a518 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 14:14:02 +1100 Subject: [PATCH 13/27] Fix issues with progress bar and memory usage --- 1.4.md | 2 +- neofetch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/1.4.md b/1.4.md index 71e59040..bc99e362 100644 --- a/1.4.md +++ b/1.4.md @@ -10,7 +10,7 @@ **Added the ability to print certain info as a progress bar.** -![1](https://cloud.githubusercontent.com/assets/6799467/13480732/04873af6-e134-11e5-9027-f8b120f58008.png) +![1](https://cloud.githubusercontent.com/assets/6799467/13483613/1cd0e1dc-e14a-11e5-8170-6de662cce562.png) - Added `--progress_char` and `$progress_char` to set the character the progress bars
will be drawn with. diff --git a/neofetch b/neofetch index 6188f9dd..cd6f9a75 100755 --- a/neofetch +++ b/neofetch @@ -1079,7 +1079,7 @@ getmemory () { esac [ "$memory_bar" == "on" ] && \ - memory+=" $(bar "$((memused / 100000))" "$((memtotal / 100000))")" + memory+=" $(bar "$memused" "$memtotal")" } # }}} From 9ebfaf40bbe9e0168f13805b0e554c8ba6d69640 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 15:23:14 +1100 Subject: [PATCH 14/27] Remove pointless variable --- neofetch | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/neofetch b/neofetch index cd6f9a75..5ac26d46 100755 --- a/neofetch +++ b/neofetch @@ -2290,8 +2290,7 @@ esac bar() { # Get the values - percent="$1" - elapsed=$((percent * progress_length / $2)) + elapsed=$(($1 * progress_length / $2)) # Create the bar with spaces prog=$(printf %"$elapsed"s) From 2a327bde3b21b49810966f0ce7ddb8f6610efaa4 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 09:10:55 +1100 Subject: [PATCH 15/27] Fix double space --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5ac26d46..62775434 100755 --- a/neofetch +++ b/neofetch @@ -1618,7 +1618,7 @@ getcols () { # CPU Usage {{{ getcpu_usage () { - cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" + cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" cpu_usage="${cpu_usage/\.*}%" [ "$cpu_usage_bar" == "on" ] && \ From 1fd64f5bea05289b06be128978601bcae722cc10 Mon Sep 17 00:00:00 2001 From: Dylan Date: Mon, 7 Mar 2016 23:15:54 +1100 Subject: [PATCH 16/27] Add options to hide info when printing progress bars --- config/config | 11 +++++++++++ neofetch | 46 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 50 insertions(+), 7 deletions(-) diff --git a/config/config b/config/config index ecf361b7..80fbdc6b 100644 --- a/config/config +++ b/config/config @@ -244,6 +244,17 @@ memory_bar="off" battery_bar="off" disk_bar="off" +# Enable/Disable showing just the bar on its own. +# Set this to 'off' to only show the progress bar. +# --cpu_usage_info on/off +# --memory_info on/off +# --battery_info on/off +# --disk_info on/off +cpu_usage_info="on" +memory_info="on" +battery_info="on" +disk_info="on" + # }}} # Image Options {{{ diff --git a/neofetch b/neofetch index 62775434..1ad469cb 100755 --- a/neofetch +++ b/neofetch @@ -266,6 +266,17 @@ memory_bar="off" battery_bar="off" disk_bar="off" +# Enable/Disable showing just the bar on its own. +# Set this to 'off' to only show the progress bar. +# --cpu_usage_info on/off +# --memory_info on/off +# --battery_info on/off +# --disk_info on/off +cpu_usage_info="on" +memory_info="on" +battery_info="on" +disk_info="on" + # }}} # Image Options {{{ @@ -1078,8 +1089,13 @@ getmemory () { ;; esac - [ "$memory_bar" == "on" ] && \ - memory+=" $(bar "$memused" "$memtotal")" + # Progress bars + if [ "$memory_bar" == "on" ]; then + case "$memory_info" in + "off") memory=" $(bar "$memused" "$memtotal")" ;; + *) memory+=" $(bar "$memused" "$memtotal")" ;; + esac + fi } # }}} @@ -1385,7 +1401,11 @@ getdisk () { if [ "$disk_bar" == "on" ]; then disk_used=${disk_used/T} disk_total=${disk_total/T} - disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" + + case "$disk_info" in + "off") disk="$disk_total_per $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + *) disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + esac fi } @@ -1474,8 +1494,12 @@ getbattery () { ;; esac - [ "$battery_bar" == "on" ] && \ - battery+=" $(bar ${battery/'%'} 100)" + if [ "$battery_bar" == "on" ]; then + case "$battery_info" in + "off") battery+=" $(bar ${battery/'%'} 100)" ;; + *) battery="$(bar ${battery/'%'} 100)" ;; + esac + fi } # }}} @@ -1621,8 +1645,12 @@ getcpu_usage () { cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" cpu_usage="${cpu_usage/\.*}%" - [ "$cpu_usage_bar" == "on" ] && \ - cpu_usage+=" $(bar "${cpu_usage/'%'}" 100)" + if [ "$cpu_usage_bar" == "on" ]; then + case "$cpu_usage_info" in + "off") cpu_usage="$(bar "${cpu_usage/'%'}" 100)" ;; + *) cpu_usage+=" $(bar "${cpu_usage/'%'}" 100)" ;; + esac + fi } @@ -2495,6 +2523,10 @@ while [ "$1" ]; do --memory_bar) memory_bar="$2" ;; --battery_bar) battery_bar="$2" ;; --disk_bar) disk_bar="$2" ;; + --cpu_usage_info) cpu_usage_info="$2" ;; + --memory_info) memory_info="$2" ;; + --battery_info) battery_info="$2" ;; + --disk_info) disk_info="$2" ;; # Image --image) From d37dd86cb597bd01db915a844a0d92a1364997a3 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 20:38:53 +1100 Subject: [PATCH 17/27] fixed a few issues with the progress bars --- neofetch | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 1ad469cb..f814055f 100755 --- a/neofetch +++ b/neofetch @@ -1399,11 +1399,13 @@ getdisk () { disk="${disk_used} / ${disk_total} (${disk_total_per})" if [ "$disk_bar" == "on" ]; then + disk_used=${disk_used/G} disk_used=${disk_used/T} + disk_total=${disk_total/G} disk_total=${disk_total/T} case "$disk_info" in - "off") disk="$disk_total_per $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + "off") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; *) disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; esac fi @@ -1496,8 +1498,8 @@ getbattery () { if [ "$battery_bar" == "on" ]; then case "$battery_info" in - "off") battery+=" $(bar ${battery/'%'} 100)" ;; - *) battery="$(bar ${battery/'%'} 100)" ;; + "off") battery="$(bar ${battery/'%'} 100)" ;; + *) battery+=" $(bar ${battery/'%'} 100)" ;; esac fi } From 8cce81c47ef51616078b6f708cbdde116f4fe0da Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 23:01:20 +1100 Subject: [PATCH 18/27] made cpu_bar easier to use --- neofetch | 55 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 8 deletions(-) diff --git a/neofetch b/neofetch index f814055f..babdae1c 100755 --- a/neofetch +++ b/neofetch @@ -881,6 +881,46 @@ getcpu () { cpu=${cpu// Six-Core} cpu=${cpu// Eight-Core} cpu=${cpu// with Radeon HD Graphics} + + # Make the output of cpu shorter + case "$cpu_shorthand" in + "name") + cpu=${cpu/@*} + ;; + + "speed") + cpu=${cpu#*@ } + ;; + + "on" | "tiny") + cpu=${cpu/Intel } + cpu=${cpu/Core } + cpu=${cpu/Core? Duo } + cpu=${cpu/AMD } + + case "$cpu_shorthand" in + "tiny") cpu=${cpu/@*} ;; + esac + ;; + esac + + # Add CPU info bar + case "$cpu_info_bar" in + "info" | "bar" | "infobar" | "barinfo") + prin "CPU: ${cpu}" + + cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" + cpu_usage="${cpu_usage/\.*}%" + + case "$cpu_info_bar" in + "info") prin "CPU Usage: ${cpu_usage}" ;; + "bar") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100)" ;; + "infobar") prin "CPU Usage: ${cpu_usage} $(bar "${cpu_usage/'%'}" 100)" ;; + "barinfo") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100) ${cpu_usage}" ;; + esac + + unset cpu + esac } # }}} @@ -2521,14 +2561,13 @@ while [ "$1" ]; do progress_color_elapsed="$2" progress_color_total="$3" ;; - --cpu_usage_bar) cpu_usage_bar="$2" ;; - --memory_bar) memory_bar="$2" ;; - --battery_bar) battery_bar="$2" ;; - --disk_bar) disk_bar="$2" ;; - --cpu_usage_info) cpu_usage_info="$2" ;; - --memory_info) memory_info="$2" ;; - --battery_info) battery_info="$2" ;; - --disk_info) disk_info="$2" ;; + --cpu_display) + cpu_shorthand="$2" + cpu_info_bar="$3" + ;; + --memory_info_bar) memory_info_bar="$2" ;; + --battery_info_bar) battery_info_bar="$2" ;; + --disk_info_bar) disk_info_bar="$2" ;; # Image --image) From 78e78a08f2e9998251f906ff707ffeb84a2cb8ce Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 23:43:16 +1100 Subject: [PATCH 19/27] made disk_bar easier to use --- neofetch | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/neofetch b/neofetch index babdae1c..b342d257 100755 --- a/neofetch +++ b/neofetch @@ -1438,17 +1438,22 @@ getdisk () { # Put it all together disk="${disk_used} / ${disk_total} (${disk_total_per})" - if [ "$disk_bar" == "on" ]; then - disk_used=${disk_used/G} - disk_used=${disk_used/T} - disk_total=${disk_total/G} - disk_total=${disk_total/T} + # Add info bar + case "$disk_info_bar" in + "bar" | "infobar" | "barinfo") + disk_used=${disk_used/G} + disk_used=${disk_used/T} + disk_total=${disk_total/G} + disk_total=${disk_total/T} - case "$disk_info" in - "off") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; - *) disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; - esac - fi + case "$disk_info_bar" in + "bar") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + "infobar") disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + "barinfo") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}") $disk" ;; + esac + + ;; + esac } # }}} From 2ac5c9e791f7fd7f0a25409507333337ce614682 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 13 Mar 2016 00:00:02 +1100 Subject: [PATCH 20/27] made memory_bar easier to use --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index b342d257..248c805d 100755 --- a/neofetch +++ b/neofetch @@ -1130,12 +1130,11 @@ getmemory () { esac # Progress bars - if [ "$memory_bar" == "on" ]; then - case "$memory_info" in - "off") memory=" $(bar "$memused" "$memtotal")" ;; - *) memory+=" $(bar "$memused" "$memtotal")" ;; - esac - fi + case "$memory_info_bar" in + "bar") memory="$(bar "${memused}" "${memtotal}")" ;; + "infobar") memory="${memory} $(bar "${memused}" "${memtotal}")" ;; + "barinfo") memory="$(bar "${memused}" "${memtotal}") ${memory}" ;; + esac } # }}} From fec784019e326d9f56090853864987827b72513e Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 13 Mar 2016 00:05:48 +1100 Subject: [PATCH 21/27] made battery_bar easier to use --- neofetch | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/neofetch b/neofetch index 248c805d..d9b66561 100755 --- a/neofetch +++ b/neofetch @@ -1540,12 +1540,11 @@ getbattery () { ;; esac - if [ "$battery_bar" == "on" ]; then - case "$battery_info" in - "off") battery="$(bar ${battery/'%'} 100)" ;; - *) battery+=" $(bar ${battery/'%'} 100)" ;; - esac - fi + case "$battery_info_bar" in + "bar") battery="$(bar ${battery/'%'} 100)" ;; + "infobar") battery="${battery} $(bar "${battery/'%'}" 100)" ;; + "barinfo") battery="$(bar "${battery/'%'}" 100) ${battery}" ;; + esac } # }}} From 5080f0fda46a1333f5f030a9e119fa203d34defa Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sun, 13 Mar 2016 07:58:46 +1100 Subject: [PATCH 22/27] fixed issues and added usage info --- neofetch | 98 ++++++++++++++++++++++++++------------------------------ 1 file changed, 45 insertions(+), 53 deletions(-) diff --git a/neofetch b/neofetch index d9b66561..4dea730d 100755 --- a/neofetch +++ b/neofetch @@ -115,6 +115,12 @@ shell_version="off" # scaling_current, scaling_min, scaling_max speed_type="max" +# CPU Display +# Set shorthand setting and progress bar setting +# --cpu_display (name, speed, tiny, on, off) (bar, infobar, barinfo, off) +cpu_shorthand="off" +cpu_display="off" + # GPU @@ -257,25 +263,13 @@ progress_color_elapsed="6" progress_color_total="8" # Enable/Disable progress bars -# --cpu_usage_bar on/off -# --memory_bar on/off -# --battery_bar on/off -# --disk_bar on/off -cpu_usage_bar="off" -memory_bar="off" -battery_bar="off" -disk_bar="off" +# --memory_bar bar/infobar/barinfo/off +# --battery_bar bar/infobar/barinfo/off +# --disk_bar bar/infobar/barinfo/off +memory_display="off" +battery_display="off" +disk_display="off" -# Enable/Disable showing just the bar on its own. -# Set this to 'off' to only show the progress bar. -# --cpu_usage_info on/off -# --memory_info on/off -# --battery_info on/off -# --disk_info on/off -cpu_usage_info="on" -memory_info="on" -battery_info="on" -disk_info="on" # }}} @@ -905,22 +899,20 @@ getcpu () { esac # Add CPU info bar - case "$cpu_info_bar" in - "info" | "bar" | "infobar" | "barinfo") - prin "CPU: ${cpu}" - cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" - cpu_usage="${cpu_usage/\.*}%" + prin "${subtitle}: ${cpu}" - case "$cpu_info_bar" in - "info") prin "CPU Usage: ${cpu_usage}" ;; - "bar") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100)" ;; - "infobar") prin "CPU Usage: ${cpu_usage} $(bar "${cpu_usage/'%'}" 100)" ;; - "barinfo") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100) ${cpu_usage}" ;; - esac + cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" + cpu_usage="${cpu_usage/\.*}%" - unset cpu + case "$cpu_display" in + "info") prin "CPU Usage: ${cpu_usage}" ;; + "bar") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100)" ;; + "infobar") prin "CPU Usage: ${cpu_usage} $(bar "${cpu_usage/'%'}" 100)" ;; + "barinfo") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100) ${cpu_usage}" ;; esac + + unset cpu } # }}} @@ -1130,7 +1122,7 @@ getmemory () { esac # Progress bars - case "$memory_info_bar" in + case "$memory_display" in "bar") memory="$(bar "${memused}" "${memtotal}")" ;; "infobar") memory="${memory} $(bar "${memused}" "${memtotal}")" ;; "barinfo") memory="$(bar "${memused}" "${memtotal}") ${memory}" ;; @@ -1438,20 +1430,15 @@ getdisk () { disk="${disk_used} / ${disk_total} (${disk_total_per})" # Add info bar - case "$disk_info_bar" in - "bar" | "infobar" | "barinfo") - disk_used=${disk_used/G} - disk_used=${disk_used/T} - disk_total=${disk_total/G} - disk_total=${disk_total/T} + disk_used=${disk_used/G} + disk_used=${disk_used/T} + disk_total=${disk_total/G} + disk_total=${disk_total/T} - case "$disk_info_bar" in - "bar") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; - "infobar") disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; - "barinfo") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}") $disk" ;; - esac - - ;; + case "$disk_display" in + "bar") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + "infobar") disk+=" $(bar "${disk_used/'.'}" "${disk_total/'.'}")" ;; + "barinfo") disk="$(bar "${disk_used/'.'}" "${disk_total/'.'}") $disk" ;; esac } @@ -1540,7 +1527,7 @@ getbattery () { ;; esac - case "$battery_info_bar" in + case "$battery_display" in "bar") battery="$(bar ${battery/'%'} 100)" ;; "infobar") battery="${battery} $(bar "${battery/'%'}" 100)" ;; "barinfo") battery="$(bar "${battery/'%'}" 100) ${battery}" ;; @@ -2438,10 +2425,15 @@ usage () { cat << EOF --progress_length num Length in spaces to make the progress bars. --progress_colors num num Colors to make the progress bar. Set in this order: elapsed, total - --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. - --memory_bar on/off Whether or not to print a progress bar for memory usage. - --battery_bar on/off Whether or not to print a progress bar for battery usage. - --disk_bar on/off Whether or not to print a progress bar for disk usage. + --cpu_display mode1 mode2 Which shorthand to use and how CPU usage should be printed + mode1 takes: name, speed, tiny, on, off + mode2 takes: info, bar, infobar, barinfo + --memory_display mode Which way should the memory progress bar be added + Takes bar, infobar, barinfo + --battery_display mode Which way should the battery progress bar be added + Takes bar, infobar, barinfo + --disk_display mode Which way should the disk progress bar be added + Takes bar, infobar, barinfo Image: @@ -2566,11 +2558,11 @@ while [ "$1" ]; do ;; --cpu_display) cpu_shorthand="$2" - cpu_info_bar="$3" + cpu_display="$3" ;; - --memory_info_bar) memory_info_bar="$2" ;; - --battery_info_bar) battery_info_bar="$2" ;; - --disk_info_bar) disk_info_bar="$2" ;; + --memory_display) memory_display="$2" ;; + --battery_display) battery_display="$2" ;; + --disk_display) disk_display="$2" ;; # Image --image) From 6485476ae7872590d639494531d944c57b966660 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 13 Mar 2016 08:37:33 +1100 Subject: [PATCH 23/27] Various progress bar fixes --- config/config | 33 ++++++++++++++------------------ neofetch | 53 +++++++++++++++++---------------------------------- 2 files changed, 32 insertions(+), 54 deletions(-) diff --git a/config/config b/config/config index 80fbdc6b..813ed8cc 100644 --- a/config/config +++ b/config/config @@ -234,26 +234,21 @@ progress_length="15" progress_color_elapsed="6" progress_color_total="8" -# Enable/Disable progress bars -# --cpu_usage_bar on/off -# --memory_bar on/off -# --battery_bar on/off -# --disk_bar on/off -cpu_usage_bar="off" -memory_bar="off" -battery_bar="off" -disk_bar="off" +# Customize how the info is displayed. +# bar: Only the progress bar is displayed. +# infobar: The bar is displayed after the info. +# barinfo: The bar is displayed before the info. +# off: Only the info is displayed. +# +# --cpu_displau bar/infobar/barinfo/off +# --memory_display bar/infobar/barinfo/off +# --battery_display bar/infobar/barinfo/off +# --disk_display bar/infobar/barinfo/off +cpu_display="off" +memory_display="off" +battery_display="off" +disk_display="off" -# Enable/Disable showing just the bar on its own. -# Set this to 'off' to only show the progress bar. -# --cpu_usage_info on/off -# --memory_info on/off -# --battery_info on/off -# --disk_info on/off -cpu_usage_info="on" -memory_info="on" -battery_info="on" -disk_info="on" # }}} diff --git a/neofetch b/neofetch index 4dea730d..847bcc17 100755 --- a/neofetch +++ b/neofetch @@ -262,10 +262,17 @@ progress_length="15" progress_color_elapsed="6" progress_color_total="8" -# Enable/Disable progress bars -# --memory_bar bar/infobar/barinfo/off -# --battery_bar bar/infobar/barinfo/off -# --disk_bar bar/infobar/barinfo/off +# Customize how the info is displayed. +# bar: Only the progress bar is displayed. +# infobar: The bar is displayed after the info. +# barinfo: The bar is displayed before the info. +# off: Only the info is displayed. +# +# --cpu_displau bar/infobar/barinfo/off +# --memory_display bar/infobar/barinfo/off +# --battery_display bar/infobar/barinfo/off +# --disk_display bar/infobar/barinfo/off +cpu_display="off" memory_display="off" battery_display="off" disk_display="off" @@ -899,19 +906,17 @@ getcpu () { esac # Add CPU info bar - prin "${subtitle}: ${cpu}" cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" cpu_usage="${cpu_usage/\.*}%" case "$cpu_display" in - "info") prin "CPU Usage: ${cpu_usage}" ;; - "bar") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100)" ;; - "infobar") prin "CPU Usage: ${cpu_usage} $(bar "${cpu_usage/'%'}" 100)" ;; - "barinfo") prin "CPU Usage: $(bar "${cpu_usage/'%'}" 100) ${cpu_usage}" ;; + "info") prin "${subtitle} Usage: ${cpu_usage}" ;; + "bar") prin "${subtitle} Usage: $(bar "${cpu_usage/'%'}" 100)" ;; + "infobar") prin "${subtitle} Usage: ${cpu_usage} $(bar "${cpu_usage/'%'}" 100)" ;; + "barinfo") prin "${subtitle} Usage: $(bar "${cpu_usage/'%'}" 100) ${cpu_usage}" ;; esac - unset cpu } @@ -1470,16 +1475,11 @@ getbattery () { else if [ "${#batteries[@]}" -gt 1 ]; then + unset battery + # Print each battery on a separate line. for bat in "${batteries[@]}"; do - battery="${title}${index}: ${bat}%" - - [ "$battery_bar" == "on" ] && \ - battery+=" $(bar $bat 100)" - - prin "$battery" - unset battery - index=$((index + 1)) + prin "${title}${index}: ${bat}%" done return fi @@ -1669,23 +1669,6 @@ getcols () { fi } -# }}} - -# CPU Usage {{{ - -getcpu_usage () { - cpu_usage="$(ps aux | awk 'BEGIN { sum = 0 } { sum += $3 }; END { print sum }')" - cpu_usage="${cpu_usage/\.*}%" - - if [ "$cpu_usage_bar" == "on" ]; then - case "$cpu_usage_info" in - "off") cpu_usage="$(bar "${cpu_usage/'%'}" 100)" ;; - *) cpu_usage+=" $(bar "${cpu_usage/'%'}" 100)" ;; - esac - fi -} - - # }}} # }}} From 52e887fedade0ae26c96b10d9e256992273ba08d Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 13 Mar 2016 08:38:15 +1100 Subject: [PATCH 24/27] Remove old changelog --- 1.4.md | 46 ---------------------------------------------- 1 file changed, 46 deletions(-) delete mode 100644 1.4.md diff --git a/1.4.md b/1.4.md deleted file mode 100644 index bc99e362..00000000 --- a/1.4.md +++ /dev/null @@ -1,46 +0,0 @@ -# Neofetch 1.4 - -- Renamed `fetch` to `neofetch`. Thanks for voting. - -### Packages - -- Added Debian/Ubuntu package. Thanks [@dawidd6](https://github.com/dawidd6) - -### Info - -**Added the ability to print certain info as a progress bar.** - -![1](https://cloud.githubusercontent.com/assets/6799467/13483613/1cd0e1dc-e14a-11e5-8170-6de662cce562.png) - -- Added `--progress_char` and `$progress_char` to set the character the progress bars
-will be drawn with. -- Added `--progress_length` to change the length of the progress bars. -- Added `--progress_colors` to color the progress bars. -- Added `$progress_color_elapsed` and `$progress_color_total` config options. - -**CPU Usage**
-- Added `cpu_usage` function which prints your current cpu usage. -- Added `--cpu_usage_bar` and `$cpu_usage_bar` to enable/disable displaying a progress
-bar in the output. - -**Memory**
-- Added `--memory_bar` and `$memory_bar` to enable/disable displaying a progress bar in
-the output. - -**Battery**
-- Added support for NetBSD -- Added `--battery_bar` and `$battery_bar` to enable/disable displaying a progress bar in
-the output. - -**Disk**:
-- Added `--disk_bar` and `$disk_bar` to enable/disable displaying a progress bar in
-the output. - -### Ascii - -- Added small ascii logo variants for Arch, Crux and Gentoo. -- Added new flag/option `ascii_logo_size` that takes the values `normal` and `small`. -- Optimized all ascii art fixing all leading whitespace issues. - -### Stdout -- Don't create config file when using `--stdout`. From cc6319bc1cc341fecc5d3e6dffc7e7461efce971 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 13 Mar 2016 08:42:22 +1100 Subject: [PATCH 25/27] Remove stray cpu usage stuff and update docs --- README.md | 13 +++++++++---- neofetch | 4 ---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 84f9f8c5..ae45084c 100644 --- a/README.md +++ b/README.md @@ -285,10 +285,15 @@ alias fetch2="fetch \ --progress_length num Length in spaces to make the progress bars. --progress_colors num num Colors to make the progress bar. Set in this order: elapsed, total - --cpu_usage_bar on/off Whether or not to print a progress bar for cpu usage. - --memory_bar on/off Whether or not to print a progress bar for memory usage. - --battery_bar on/off Whether or not to print a progress bar for battery usage. - --disk_bar on/off Whether or not to print a progress bar for disk usage. + --cpu_display mode1 mode2 Which shorthand to use and how CPU usage should be printed + mode1 takes: name, speed, tiny, on, off + mode2 takes: info, bar, infobar, barinfo + --memory_display mode Which way should the memory progress bar be added + Takes bar, infobar, barinfo + --battery_display mode Which way should the battery progress bar be added + Takes bar, infobar, barinfo + --disk_display mode Which way should the disk progress bar be added + Takes bar, infobar, barinfo Image: diff --git a/neofetch b/neofetch index 847bcc17..bc3c743f 100755 --- a/neofetch +++ b/neofetch @@ -63,8 +63,6 @@ printinfo () { # info "Users" users # info "Birthday" birthday - # info "CPU Usage" cpu_usage - info linebreak info cols info linebreak @@ -268,11 +266,9 @@ progress_color_total="8" # barinfo: The bar is displayed before the info. # off: Only the info is displayed. # -# --cpu_displau bar/infobar/barinfo/off # --memory_display bar/infobar/barinfo/off # --battery_display bar/infobar/barinfo/off # --disk_display bar/infobar/barinfo/off -cpu_display="off" memory_display="off" battery_display="off" disk_display="off" From 2d5f151b7e00d452e49e2921d04436b6e72c3cf5 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 13 Mar 2016 08:48:50 +1100 Subject: [PATCH 26/27] Add progress bar support for multiple batteries on linux --- neofetch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index bc3c743f..2a8ed4b1 100755 --- a/neofetch +++ b/neofetch @@ -1475,7 +1475,12 @@ getbattery () { # Print each battery on a separate line. for bat in "${batteries[@]}"; do - prin "${title}${index}: ${bat}%" + case "$battery_display" in + "bar") prin "${title}${index}: $(bar ${bat/'%'} 100)" ;; + "infobar") prin "${title}${index}: ${bat}% $(bar "${bat/'%'}" 100)" ;; + "barinfo") prin "${title}${index}: $(bar "${bat/'%'}" 100) ${bat}%" ;; + *) prin "${title}${index}: ${bat}%" ;; + esac done return fi From bf4bd9a10b3bb04b074bdac7f7dfadc38d9844fb Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 13 Mar 2016 08:50:21 +1100 Subject: [PATCH 27/27] Fix missing index line causing battery titles to not display correctly --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 2a8ed4b1..b1aac63d 100755 --- a/neofetch +++ b/neofetch @@ -1481,6 +1481,7 @@ getbattery () { "barinfo") prin "${title}${index}: $(bar "${bat/'%'}" 100) ${bat}%" ;; *) prin "${title}${index}: ${bat}%" ;; esac + index=$((index + 1)) done return fi