From 3a826e16ccc30b06c501d7c06c4c064aed1b05f2 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 2 Mar 2016 17:56:28 +1100 Subject: [PATCH 01/76] Made the separator in stdout mode configurable with '--stdout_separator' and '$stdout_separator' --- config/config | 8 ++++++++ neofetch | 22 ++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/config/config b/config/config index 71b2f723..e9373e92 100644 --- a/config/config +++ b/config/config @@ -321,6 +321,14 @@ scrot_dir="$HOME/Pictures" scrot_name="neofetch-%Y-%m-%d-%H:%M.png" +# }}} + +# Stdout options {{{ + +# Separator for stdout mode +# --stdout_separator string +stdout_separator=" " + # }}} # Config Options {{{ diff --git a/neofetch b/neofetch index c1e36516..0ddb9397 100755 --- a/neofetch +++ b/neofetch @@ -342,6 +342,14 @@ scrot_dir="$HOME/Pictures" scrot_name="neofetch-%Y-%m-%d-%H:%M.png" +# }}} + +# Stdout options {{{ + +# Separator for stdout mode +# --stdout_separator string +stdout_separator=" " + # }}} # Config Options {{{ @@ -1955,15 +1963,25 @@ prin () { # Stdout {{{ stdout () { + stdout_separator_flag="$(awk -F '--stdout_separator ' '{printf $2}' <<< "${args[@]}")" + stdout_separator_flag=${stdout_separator_flag/ '--'*} + + [ ! -z "$stdout_separator_flag" ] && \ + stdout_separator="$stdout_separator_flag" + + index=0 for func in "${args[@]}"; do case "$func" in "--"*) break ;; + *) "get$func" 2>/dev/null eval output="\$$func" - printf "%s" "$output " + case "${args[$((index + 1))]}" in "--"*) unset stdout_separator ;; esac + printf "%s" "${output}${stdout_separator}" ;; esac + index=$((index + 1)) done exit } @@ -2447,7 +2465,7 @@ while [ "$1" ]; do unset info_color colors case "$2" in "--"* | "") echo "--stdout requires at least one argument"; exit ;; - *) shift; args=("$@"); config="off" stdout ;; + *) shift; args=("$@"); config="off"; stdout ;; esac ;; From c9157fbd676d675cd2e7afb5cedfd1e705293fc2 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 2 Mar 2016 17:58:48 +1100 Subject: [PATCH 02/76] Remove whitespace --- neofetch | 1 - 1 file changed, 1 deletion(-) diff --git a/neofetch b/neofetch index 0ddb9397..98974f78 100755 --- a/neofetch +++ b/neofetch @@ -1973,7 +1973,6 @@ stdout () { for func in "${args[@]}"; do case "$func" in "--"*) break ;; - *) "get$func" 2>/dev/null eval output="\$$func" From 670fb2238ec479d51a28da6fa5b63ad2393722f6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 3 Mar 2016 16:35:24 +1100 Subject: [PATCH 03/76] Simplified sdtout function --- neofetch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index 98974f78..6e3071f6 100755 --- a/neofetch +++ b/neofetch @@ -1963,25 +1963,25 @@ prin () { # Stdout {{{ stdout () { + # Read args early for the separator stdout_separator_flag="$(awk -F '--stdout_separator ' '{printf $2}' <<< "${args[@]}")" stdout_separator_flag=${stdout_separator_flag/ '--'*} [ ! -z "$stdout_separator_flag" ] && \ stdout_separator="$stdout_separator_flag" - index=0 for func in "${args[@]}"; do case "$func" in "--"*) break ;; *) "get$func" 2>/dev/null eval output="\$$func" - case "${args[$((index + 1))]}" in "--"*) unset stdout_separator ;; esac - printf "%s" "${output}${stdout_separator}" + stdout+="${output}${stdout_separator}" ;; esac - index=$((index + 1)) done + + printf "%s" "${stdout%%${stdout_separator}}" exit } From 41ff583aabd6c6488f5062caba881269ef1f035a Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 07:58:20 +1100 Subject: [PATCH 04/76] Changelog --- 1.4.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/1.4.md b/1.4.md index 601f3fe7..74722df2 100644 --- a/1.4.md +++ b/1.4.md @@ -19,3 +19,13 @@ ### Stdout - Don't create config file when using `--stdout`. +- Reimplemt `--stdout_separator` and `$stdout_separator` which allow you to change
+the separator between the info. + +Example: + +```sh +# Display memory, battery and disk in a single line separated by " | " +# This output can then be used in lemonbar etc. +neofetch --stdout memory battery disk --stdout_separator " | " +``` From d3ff3d77353eb984031ae68b847623b79eb4cf26 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 07:58:57 +1100 Subject: [PATCH 05/76] Changelog --- 1.4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.4.md b/1.4.md index 74722df2..1c07e3dd 100644 --- a/1.4.md +++ b/1.4.md @@ -19,7 +19,7 @@ ### Stdout - Don't create config file when using `--stdout`. -- Reimplemt `--stdout_separator` and `$stdout_separator` which allow you to change
+- Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
the separator between the info. Example: From 554d65de8299b415b6b27f341c68924a862d8cc3 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 08:48:16 +1100 Subject: [PATCH 06/76] Remove duplicate resolution line --- config/config | 1 - neofetch | 1 - 2 files changed, 2 deletions(-) diff --git a/config/config b/config/config index e9373e92..df8c818e 100644 --- a/config/config +++ b/config/config @@ -35,7 +35,6 @@ printinfo () { # info "Font" font # info "Disk" disk - # info "Resolution" resolution # info "Battery" battery # info "Local IP" localip # info "Public IP" publicip diff --git a/neofetch b/neofetch index 682f73f9..69809928 100755 --- a/neofetch +++ b/neofetch @@ -55,7 +55,6 @@ printinfo () { # info "Font" gtkfont # info "Disk" disk - # info "Resolution" resolution # info "Battery" battery # info "Song" song # info "Local IP" localip From 9a8ef53db3e9de7fc132e94b7ce0ed8c26aab548 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 4 Mar 2016 12:04:38 +1100 Subject: [PATCH 07/76] Update Crux link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5e7c19c4..276b7997 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 1. Install git and the git ports(8) driver - `sudo prt-get depinst git` 2. Add the 3rd party repo - - `sudo wget -O /etc/ports/arcetera.git https://git.io/vgNJ6` + - `sudo wget -O /etc/ports/arcetera.git http://arcetera.moe/sync` 3. Sync the repos - `sudo ports -u` 4. Install the package From 73b0e4c786a412999f185f19647bc5f3a2dbdeb0 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 12:32:06 +1100 Subject: [PATCH 08/76] [Linux] Added spotify support to getsong --- neofetch | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 69809928..caf13d73 100755 --- a/neofetch +++ b/neofetch @@ -1075,6 +1075,21 @@ getsong () { song="$(mocp -Q "%artist - %song" 2>/dev/null)" state="$(mocp -Q "%state" 2>/dev/null)" + elif pgrep "spotify" >/dev/null 2>&1; then + case "$os" in + "Linux") + # This command is way too long + song="$(\ + dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 \ + org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' string:'Metadata' |\ + awk -F 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\ + awk -F '"' '/artist|title/ {printf $2 " - "}'\ + )" + song=${song% - } + song=${song/'('*} + song=${song//'['*} + ;; + esac else song="Unknown" fi @@ -1084,7 +1099,7 @@ getsong () { song="Paused" ;; - "stopped" | "STOP" | "") + "stopped" | "STOP") song="Stopped" ;; esac From 69060acb329e2af81bf3c0025c55f7aa12bdf45e Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 12:55:54 +1100 Subject: [PATCH 09/76] Changelog --- 1.4.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/1.4.md b/1.4.md index 1c07e3dd..addabd0f 100644 --- a/1.4.md +++ b/1.4.md @@ -11,6 +11,9 @@ **Battery**
- Added support for NetBSD +**Song**
+- [Linux] Added support for Spotify. + ### Ascii - Added small ascii logo variants for Arch, Crux and Gentoo. From 59d3d7aa38558e91494e7d59ce90603c883e76a1 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 4 Mar 2016 13:15:03 +1100 Subject: [PATCH 10/76] Reimplement 'color' function --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index caf13d73..4d5291b5 100755 --- a/neofetch +++ b/neofetch @@ -2164,6 +2164,10 @@ setcolors () { fi } +color () { + printf "%b%s" "\033[38;5;${1}m" +} + # }}} From ed8ebeb733e2e3dd6ee31b8dd1c9dcb9ea9e67d5 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 4 Mar 2016 20:59:56 +0700 Subject: [PATCH 11/76] Added man page for neofetch --- neofetch.1 | 232 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) create mode 100644 neofetch.1 diff --git a/neofetch.1 b/neofetch.1 new file mode 100644 index 00000000..83ae890c --- /dev/null +++ b/neofetch.1 @@ -0,0 +1,232 @@ +.TH NEOFETCH "1" "March 2016" "1.3" "User Commands" +.SH NAME +neofetch \- simple system information script + +.SH SYNOPSIS +.B neofetch \fR[OPTIONAL FLAGS] + +.SH DESCRIPTION +neofetch is a script that gathers information about your system and prints +it to the terminal next to an image, a distro's logo or any ASCII art of +your choice. + +.SH OPTIONS +.TP +.B \--disable 'INFONAME' +Allows you to disable an info line from appearing in the output. +.br +NOTE: You can supply multiple args. eg. +.br +\'neofetch --disable cpu gpu disk shell\' +.TP +.B \--osx_buildversion 'ON/OFF' +Hide/Show Mac OS X build version. +.TP +.B \--os_arch 'ON/OFF' +Hide/Show Windows architecture. +.TP +.B \--speed_type 'TYPE' +Change the type of cpu speed to display. +.br +Possible values: current, min, max, bios, +scaling_current, scaling_min, scaling_max +.br +NOTE: This only support Linux with cpufreq. +.TP +.B \--kernel_shorthand 'ON/OFF' +Shorten the output of kernel +.TP +.B \--uptime_shorthand 'ON/OFF' +Shorten the output of uptime (tiny, on, off) +.TP +.B \--gpu_shorthand 'ON/OFF' +Shorten the output of GPU +.TP +.B \--gtk_shorthand 'ON/OFF' +Shorten output of gtk theme/icons +.TP +.B \--gtk2 'ON/OFF' +Enable/Disable GTK2 theme/icons output +.TP +.B \--gtk3 'ON/OFF' +Enable/Disable gtk3 theme/icons output +.TP +.B \--shell_path 'ON/OFF' +Enable/Disable showing \$SHELL path +.TP +.B \--shell_version 'ON/OFF' +Enable/Disable showing \$SHELL version +.TP +.B \--battery_num 'NUM' +Which battery to display, default value is 'all' +.TP +.B \--battery_shorthand 'ON/OFF' +Whether or not each battery gets its own line/title +.TP +.B \--ip_host 'URL' +URL to ping for public IP +.TP +.B \--song_shorthand 'ON/OFF' +Print the Artist/Title on seperate lines +.TP +.B \--birthday_shorthand 'ON/OFF' +Shorten the output of birthday +.TP +.B \--birthday_time 'ON/OFF' +Enable/Disable showing the time in birthday output + +.SH TEXT COLORS +.TP +.B \--colors x x x x x x +Changes the text colors in this order: +title, @, underline, subtitle, colon, info + +.SH TEXT FORMATTING +.TP +.B \--underline_char 'CHAR' +Character to use when underlineing title +.TP +.B \--line_wrap 'ON/OFF' +Enable/Disable line wrapping +.TP +.B \--bold 'ON/OFF' +Enable/Disable bold text +.TP +.B \--prompt_height 'NUM' +Set this to your prompt height to fix issues +with the text going off screen at the top + +.SH COLOR BLOCKS +.TP +.B \--color_blocks 'ON/OFF' +Enable/Disable the color blocks +.TP +.B \--block_width 'NUM' +Width of color blocks +.TP +.B \--block_range 'START' 'END' +Range of colors to print as blocks + +.SH IMAGE +.TP +.B \--image 'TYPE' +Image source. Where and what image we display. +.br +Possible values: wall, shuffle, ascii, /path/to/img, off +.TP +.B \--size 'SIZE' +Size to make the image, takes pixels or a percentage. +.TP +.B \--image_backend 'w3m/iterm2' +Which program to use to draw images. +.TP +.B \--shuffle_dir 'PATH' +Which directory to shuffle for an image. +.TP +.B \--image_position 'LEFT/RIGHT' +Where to display the image: (Left/Right) +.TP +.B \--crop_mode 'MODE' +Which crop mode to use +.br Takes the values: normal, fit, fill +.TP +.B \--crop_offset 'VALUE' +Change the crop offset for normal mode. +.br +Possible values: northwest, north, northeast, +west, center, east, southwest, south, southeast +.TP +.B \--xoffset 'VALUE' +How close the image will be to the left edge of the +window in pixel. This only works with w3m. +.TP +.B \--yoffset 'VALUE' +How close the image will be to the top edge +of the window. This only works with w3m. +.TP +.B \--gap 'NUM' +Gap between image and text. +.br +NOTE: --gap can take a negative value which +will move the text closer to the left side. +.TP +.B \--clean +Remove all cropped images + +.SH ASCII +.TP +.B \--ascii 'VALUE' +Where to get the ASCII from +.br +Possible values: distro, /path/to/ascii +.TP +.B \--ascii_color 'NUM' +Color to print the ASCII art +.TP +.B \--ascii_distro 'DISTRO' +Which Distro\'s ASCII art to print + +.SH STDOUT +.TP +.B \--stdout info info +Launch fetch in stdout mode which prints the info in +a plain-text format that you can use with lemonbar etc. +.TP +.B \--stdout_title 'ON/OFF' +Hide/Show the title in stdout mode. +.TP +.B \--stdout_separator 'STRING' +String to use as a separator in stdout mode. +.TP +.B \--stdout_subtitles 'ON/OFF' +Hide/Show the subtitles in stdout mode. + + +.SH SCREENSHOT +.TP +.B \--scrot 'PATH' +Take a screenshot, if path is left empty the screenshot +function will use \$scrot_dir and \$scrot_name. +.TP +.B \--scrot_cmd 'CMD' +Screenshot program to launch + +.SH OTHER +.TP +.B \--config 'PATH' +Specify a path to a custom config file +.TP +.B \--config none +Launch the script without a config file +.TP +.B \--help + +.SH "SEE ALSO" +http://github.com/dylanaraps/neofetch + +.SH BUGS +Report bugs to + +.SH LICENSE + +The MIT License (MIT) + +Copyright (c) 2016 Dylan Araps + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom +the Software is furnished to do so, subject to the following conditions: + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. + +.SH AUTHOR +Created by Dylan Araps. From b2d4dd01b25efa883fa8936f69209655931c523a Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 4 Mar 2016 21:01:57 +0700 Subject: [PATCH 12/76] Updated version --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 83ae890c..4f1a1441 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,4 +1,4 @@ -.TH NEOFETCH "1" "March 2016" "1.3" "User Commands" +.TH NEOFETCH "1" "March 2016" "1.4444" "User Commands" .SH NAME neofetch \- simple system information script From 8dc09a95a5af397be466f22e24cbf26ff0915423 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 4 Mar 2016 21:18:22 +0700 Subject: [PATCH 13/76] Slight fix --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 4f1a1441..bfce0c50 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -84,7 +84,7 @@ title, @, underline, subtitle, colon, info .SH TEXT FORMATTING .TP .B \--underline_char 'CHAR' -Character to use when underlineing title +Character to use when underlining title .TP .B \--line_wrap 'ON/OFF' Enable/Disable line wrapping From ba0f7554f76ed2f0660707d10b3a39b6154e9ee6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 09:21:57 +1100 Subject: [PATCH 14/76] Add man page install to makefile, lowercase all values in manpage and update changelog --- 1.4.md | 1 + Makefile | 2 ++ neofetch.1 | 92 +++++++++++++++++++++++++++--------------------------- 3 files changed, 49 insertions(+), 46 deletions(-) diff --git a/1.4.md b/1.4.md index addabd0f..51a6a938 100644 --- a/1.4.md +++ b/1.4.md @@ -1,6 +1,7 @@ # Neofetch 1.4 - Renamed `fetch` to `neofetch`. Thanks for voting. +- Fetch now has a man page. (man neofetch) Thanks **[@konimex](https://github.com/konimex)** ### Packages diff --git a/Makefile b/Makefile index b2ec826b..817318d8 100644 --- a/Makefile +++ b/Makefile @@ -11,11 +11,13 @@ install: $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro $(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch + $(INSTALL_PROG) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 $(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config $(INSTALL_PROG) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro uninstall: $(RM) $(DESTDIR)$(PREFIX)/bin/neofetch + $(RM) $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 $(RM) -r $(DESTDIR)$(PREFIX)/share/neofetch diff --git a/neofetch.1 b/neofetch.1 index bfce0c50..1af14f13 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -3,29 +3,29 @@ neofetch \- simple system information script .SH SYNOPSIS -.B neofetch \fR[OPTIONAL FLAGS] +.B neofetch \fR[Optional Flags] .SH DESCRIPTION -neofetch is a script that gathers information about your system and prints +neofetch is a script that gathers information about your system and prints it to the terminal next to an image, a distro's logo or any ASCII art of your choice. .SH OPTIONS .TP -.B \--disable 'INFONAME' +.B \--disable 'infoname' Allows you to disable an info line from appearing in the output. .br NOTE: You can supply multiple args. eg. .br \'neofetch --disable cpu gpu disk shell\' .TP -.B \--osx_buildversion 'ON/OFF' +.B \--osx_buildversion 'on/off' Hide/Show Mac OS X build version. .TP -.B \--os_arch 'ON/OFF' +.B \--os_arch 'on/off' Hide/Show Windows architecture. .TP -.B \--speed_type 'TYPE' +.B \--speed_type 'type' Change the type of cpu speed to display. .br Possible values: current, min, max, bios, @@ -33,46 +33,46 @@ scaling_current, scaling_min, scaling_max .br NOTE: This only support Linux with cpufreq. .TP -.B \--kernel_shorthand 'ON/OFF' +.B \--kernel_shorthand 'on/off' Shorten the output of kernel .TP -.B \--uptime_shorthand 'ON/OFF' +.B \--uptime_shorthand 'on/off' Shorten the output of uptime (tiny, on, off) .TP -.B \--gpu_shorthand 'ON/OFF' +.B \--gpu_shorthand 'on/off' Shorten the output of GPU .TP -.B \--gtk_shorthand 'ON/OFF' +.B \--gtk_shorthand 'on/off' Shorten output of gtk theme/icons -.TP -.B \--gtk2 'ON/OFF' +.TP +.B \--gtk2 'on/off' Enable/Disable GTK2 theme/icons output .TP -.B \--gtk3 'ON/OFF' +.B \--gtk3 'on/off' Enable/Disable gtk3 theme/icons output .TP -.B \--shell_path 'ON/OFF' +.B \--shell_path 'on/off' Enable/Disable showing \$SHELL path .TP -.B \--shell_version 'ON/OFF' +.B \--shell_version 'on/off' Enable/Disable showing \$SHELL version .TP -.B \--battery_num 'NUM' +.B \--battery_num 'num' Which battery to display, default value is 'all' .TP -.B \--battery_shorthand 'ON/OFF' +.B \--battery_shorthand 'on/off' Whether or not each battery gets its own line/title .TP -.B \--ip_host 'URL' +.B \--ip_host 'url' URL to ping for public IP .TP -.B \--song_shorthand 'ON/OFF' +.B \--song_shorthand 'on/off' Print the Artist/Title on seperate lines .TP -.B \--birthday_shorthand 'ON/OFF' +.B \--birthday_shorthand 'on/off' Shorten the output of birthday .TP -.B \--birthday_time 'ON/OFF' +.B \--birthday_time 'on/off' Enable/Disable showing the time in birthday output .SH TEXT COLORS @@ -83,68 +83,68 @@ title, @, underline, subtitle, colon, info .SH TEXT FORMATTING .TP -.B \--underline_char 'CHAR' +.B \--underline_char 'char' Character to use when underlining title .TP -.B \--line_wrap 'ON/OFF' +.B \--line_wrap 'on/off' Enable/Disable line wrapping .TP -.B \--bold 'ON/OFF' +.B \--bold 'on/off' Enable/Disable bold text .TP -.B \--prompt_height 'NUM' +.B \--prompt_height 'num' Set this to your prompt height to fix issues with the text going off screen at the top .SH COLOR BLOCKS .TP -.B \--color_blocks 'ON/OFF' +.B \--color_blocks 'on/off' Enable/Disable the color blocks .TP -.B \--block_width 'NUM' +.B \--block_width 'num' Width of color blocks .TP -.B \--block_range 'START' 'END' +.B \--block_range 'start' 'end' Range of colors to print as blocks .SH IMAGE .TP -.B \--image 'TYPE' +.B \--image 'type' Image source. Where and what image we display. .br Possible values: wall, shuffle, ascii, /path/to/img, off .TP -.B \--size 'SIZE' +.B \--size 'size' Size to make the image, takes pixels or a percentage. .TP .B \--image_backend 'w3m/iterm2' Which program to use to draw images. .TP -.B \--shuffle_dir 'PATH' +.B \--shuffle_dir 'path' Which directory to shuffle for an image. .TP -.B \--image_position 'LEFT/RIGHT' +.B \--image_position 'left/right' Where to display the image: (Left/Right) .TP -.B \--crop_mode 'MODE' +.B \--crop_mode 'mode' Which crop mode to use .br Takes the values: normal, fit, fill .TP -.B \--crop_offset 'VALUE' +.B \--crop_offset 'value' Change the crop offset for normal mode. .br Possible values: northwest, north, northeast, west, center, east, southwest, south, southeast .TP -.B \--xoffset 'VALUE' +.B \--xoffset 'value' How close the image will be to the left edge of the window in pixel. This only works with w3m. .TP -.B \--yoffset 'VALUE' +.B \--yoffset 'value' How close the image will be to the top edge of the window. This only works with w3m. .TP -.B \--gap 'NUM' +.B \--gap 'num' Gap between image and text. .br NOTE: --gap can take a negative value which @@ -155,15 +155,15 @@ Remove all cropped images .SH ASCII .TP -.B \--ascii 'VALUE' +.B \--ascii 'value' Where to get the ASCII from .br Possible values: distro, /path/to/ascii .TP -.B \--ascii_color 'NUM' +.B \--ascii_color 'num' Color to print the ASCII art .TP -.B \--ascii_distro 'DISTRO' +.B \--ascii_distro 'distro' Which Distro\'s ASCII art to print .SH STDOUT @@ -172,19 +172,19 @@ Which Distro\'s ASCII art to print Launch fetch in stdout mode which prints the info in a plain-text format that you can use with lemonbar etc. .TP -.B \--stdout_title 'ON/OFF' +.B \--stdout_title 'on/off' Hide/Show the title in stdout mode. .TP -.B \--stdout_separator 'STRING' +.B \--stdout_separator 'string' String to use as a separator in stdout mode. .TP -.B \--stdout_subtitles 'ON/OFF' +.B \--stdout_subtitles 'on/off' Hide/Show the subtitles in stdout mode. .SH SCREENSHOT .TP -.B \--scrot 'PATH' +.B \--scrot 'path' Take a screenshot, if path is left empty the screenshot function will use \$scrot_dir and \$scrot_name. .TP @@ -193,13 +193,13 @@ Screenshot program to launch .SH OTHER .TP -.B \--config 'PATH' +.B \--config 'path' Specify a path to a custom config file .TP .B \--config none Launch the script without a config file .TP -.B \--help +.B \--help .SH "SEE ALSO" http://github.com/dylanaraps/neofetch From 263dedf4c796a4148cad27946ac5107681f5d364 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 09:22:48 +1100 Subject: [PATCH 15/76] Lowercase leftover value --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index 1af14f13..841bd837 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -188,7 +188,7 @@ Hide/Show the subtitles in stdout mode. Take a screenshot, if path is left empty the screenshot function will use \$scrot_dir and \$scrot_name. .TP -.B \--scrot_cmd 'CMD' +.B \--scrot_cmd 'cmd' Screenshot program to launch .SH OTHER From 2de3d688948eb5c437b308a2c124b8dcadff1f2e Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 09:30:53 +1100 Subject: [PATCH 16/76] Merge 'text colors' and 'text formatting' headings in help, makefile and readme --- README.md | 7 +++---- neofetch | 7 +++---- neofetch.1 | 5 +---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 276b7997..85b23035 100644 --- a/README.md +++ b/README.md @@ -262,12 +262,11 @@ alias fetch2="fetch \ --birthday_shorthand on/off Shorten the output of birthday --birthday_time on/off Enable/Disable showing the time in birthday output - Text Colors: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info Text Formatting: - --underline_char char Character to use when underlineing title + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline_char char Character to use when underlining title --line_wrap on/off Enable/Disable line wrapping --bold on/off Enable/Disable bold text --prompt_height num Set this to your prompt height to fix issues with diff --git a/neofetch b/neofetch index 4d5291b5..5e5e47bb 100755 --- a/neofetch +++ b/neofetch @@ -2301,12 +2301,11 @@ usage () { cat << EOF --birthday_shorthand on/off Shorten the output of birthday --birthday_time on/off Enable/Disable showing the time in birthday output - Text Colors: - --colors x x x x x x Changes the text colors in this order: - title, @, underline, subtitle, colon, info Text Formatting: - --underline_char char Character to use when underlineing title + --colors x x x x x x Changes the text colors in this order: + title, @, underline, subtitle, colon, info + --underline_char char Character to use when underlining title --line_wrap on/off Enable/Disable line wrapping --bold on/off Enable/Disable bold text --prompt_height num Set this to your prompt height to fix issues with diff --git a/neofetch.1 b/neofetch.1 index 841bd837..9b743d1d 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -75,14 +75,11 @@ Shorten the output of birthday .B \--birthday_time 'on/off' Enable/Disable showing the time in birthday output -.SH TEXT COLORS +.SH TEXT FORMATTING .TP .B \--colors x x x x x x Changes the text colors in this order: title, @, underline, subtitle, colon, info - -.SH TEXT FORMATTING -.TP .B \--underline_char 'char' Character to use when underlining title .TP From f35b04f9e301481b266d38467e42299218a02551 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 09:32:48 +1100 Subject: [PATCH 17/76] Changelog --- 1.4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.4.md b/1.4.md index 51a6a938..1ad8a9f7 100644 --- a/1.4.md +++ b/1.4.md @@ -5,7 +5,7 @@ ### Packages -- Added Debian/Ubuntu package. Thanks [@dawidd6](https://github.com/dawidd6) +- Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** ### Info From f4dd61aa1875874b339bee7a7ee61f5bacf315d1 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 13:18:30 +1100 Subject: [PATCH 18/76] Update CRUX link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 85b23035..b3472cc6 100644 --- a/README.md +++ b/README.md @@ -134,7 +134,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 1. Install git and the git ports(8) driver - `sudo prt-get depinst git` 2. Add the 3rd party repo - - `sudo wget -O /etc/ports/arcetera.git http://arcetera.moe/sync` + - `sudo wget -O /etc/ports/arcetera.git https://arcetera.moe/sync` 3. Sync the repos - `sudo ports -u` 4. Install the package From 237836b56f763658dd8474c48a6a55b615a43b7a Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 16:05:30 +1100 Subject: [PATCH 19/76] Fix issue with color blocks ending up on the same line as the prompt --- config/config | 1 + neofetch | 1 + 2 files changed, 2 insertions(+) diff --git a/config/config b/config/config index df8c818e..4f25786c 100644 --- a/config/config +++ b/config/config @@ -45,6 +45,7 @@ printinfo () { info linebreak info cols info linebreak + info linebreak } diff --git a/neofetch b/neofetch index 5e5e47bb..d4dfe8b8 100755 --- a/neofetch +++ b/neofetch @@ -65,6 +65,7 @@ printinfo () { info linebreak info cols info linebreak + info linebreak } From 299e547889cd73a453a206ae281b5ff141500af8 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 16:08:07 +1100 Subject: [PATCH 20/76] Changelog --- 1.4.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/1.4.md b/1.4.md index 1ad8a9f7..ce2666ba 100644 --- a/1.4.md +++ b/1.4.md @@ -21,6 +21,10 @@ - Added new flag/option `ascii_logo_size` that takes the values `normal` and `small`. - Optimized all ascii art fixing all leading whitespace issues. +Example of small ascii logo: + +![CRUX](https://ipfs.pics/ipfs/QmSpadVHtBPRBUJEiiztqkXqfhE2fuGS5t8bzsbxWUYaXA) + ### Stdout - Don't create config file when using `--stdout`. - Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
From 1d96d6add05cdf4cb8f28f1596a8854b06bef271 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 5 Mar 2016 12:34:17 +0700 Subject: [PATCH 21/76] Fixed Makefile --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 817318d8..324332fc 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,9 @@ all: install: $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/bin $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro + $(INSTALL_DIR) $(DESTDIR)$(PREFIX)/share/man/man1 $(INSTALL_PROG) neofetch $(DESTDIR)$(PREFIX)/bin/neofetch - $(INSTALL_PROG) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 + $(INSTALL_FILE) neofetch.1 $(DESTDIR)$(PREFIX)/share/man/man1/neofetch.1 $(INSTALL_PROG) config/config $(DESTDIR)$(PREFIX)/share/neofetch/config $(INSTALL_PROG) ascii/distro/* $(DESTDIR)$(PREFIX)/share/neofetch/ascii/distro From 17c421b03d0762f6aae0ea2100eb505c29f00308 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 5 Mar 2016 23:33:05 +1100 Subject: [PATCH 22/76] Intel gpu substitiution --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d4dfe8b8..9d7c2869 100755 --- a/neofetch +++ b/neofetch @@ -888,7 +888,8 @@ getgpu () { gpu=${gpu/Intel Corporation } gpu=${gpu/Haswell-??? } gpu=${gpu/?th Gen } - gpu=${gpu/Core Processor } + gpu=${gpu/Core } + gpu=${gpu/Processor } gpu=${gpu/ Mobile} gpu=${gpu/ Express} gpu=${gpu/Sky } From 88b5430cac6f5082b779fb8ae9470b857defed0e Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 09:08:59 +1100 Subject: [PATCH 23/76] Update docs --- README.md | 4 +--- neofetch | 3 ++- neofetch.1 | 11 ++--------- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b3472cc6..2931a851 100644 --- a/README.md +++ b/README.md @@ -306,7 +306,7 @@ alias fetch2="fetch \ Ascii: --ascii value Where to get the ascii from, Possible values: distro, /path/to/ascii - --ascii_color num Color to print the ascii art + --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro\'s ascii art to print @@ -314,9 +314,7 @@ alias fetch2="fetch \ --stdout info info Launch fetch in stdout mode which prints the info in a plain-text format that you can use with lemonbar etc. - --stdout_title on/off Hide/Show the title in stdout mode. --stdout_separator string String to use as a separator in stdout mode. - --stdout_subtitles on/off Hide/Show the subtitles in stdout mode. Screenshot: diff --git a/neofetch b/neofetch index 9d7c2869..5b60fedc 100755 --- a/neofetch +++ b/neofetch @@ -2347,7 +2347,7 @@ usage () { cat << EOF Ascii: --ascii value Where to get the ascii from, Possible values: distro, /path/to/ascii - --ascii_color num Color to print the ascii art + --ascii_colors x x x x x x Colors to print the ascii art --ascii_distro distro Which Distro's ascii art to print @@ -2355,6 +2355,7 @@ usage () { cat << EOF --stdout info info Launch neofetch in stdout mode which prints the info in a plain-text format that you can use with lemonbar etc. + --stdout_separator string String to use as a separator in stdout mode. Screenshot: diff --git a/neofetch.1 b/neofetch.1 index 9b743d1d..6be97b8b 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -157,8 +157,8 @@ Where to get the ASCII from .br Possible values: distro, /path/to/ascii .TP -.B \--ascii_color 'num' -Color to print the ASCII art +.B \--ascii_colors x x x x x x +Colors to print the ASCII art .TP .B \--ascii_distro 'distro' Which Distro\'s ASCII art to print @@ -169,15 +169,8 @@ Which Distro\'s ASCII art to print Launch fetch in stdout mode which prints the info in a plain-text format that you can use with lemonbar etc. .TP -.B \--stdout_title 'on/off' -Hide/Show the title in stdout mode. -.TP .B \--stdout_separator 'string' String to use as a separator in stdout mode. -.TP -.B \--stdout_subtitles 'on/off' -Hide/Show the subtitles in stdout mode. - .SH SCREENSHOT .TP From 256bdf4b75c9a89cb35babd9ce8314d0a55cc4e1 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 09:14:44 +1100 Subject: [PATCH 24/76] Fix incorrect theme bug with Cinnamon --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 5b60fedc..710363f1 100755 --- a/neofetch +++ b/neofetch @@ -1218,7 +1218,7 @@ getstyle () { fi ;; - "Cinnamon") + *"Cinnamon") if type -p gsettings >/dev/null 2>&1; then gtk3theme=$(gsettings get org.cinnamon.desktop.interface $gsettings) gtk3theme=${gtk3theme//"'"} From 6d01e1c82d9f75d62e523b7628584bfa70ad82d5 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 09:56:46 +1100 Subject: [PATCH 25/76] Added '--birthday_format' to format the output of Birthday --- README.md | 1 + config/config | 5 +++++ neofetch | 15 +++++++++++---- neofetch.1 | 3 +++ 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 2931a851..28fe9c8a 100644 --- a/README.md +++ b/README.md @@ -261,6 +261,7 @@ alias fetch2="fetch \ --song_shorthand on/off Print the Artist/Title on seperate lines --birthday_shorthand on/off Shorten the output of birthday --birthday_time on/off Enable/Disable showing the time in birthday output + --birthday_format format Format the birthday output. (Uses 'date' cmd format) Text Formatting: diff --git a/config/config b/config/config index 4f25786c..0f42e5d5 100644 --- a/config/config +++ b/config/config @@ -158,6 +158,11 @@ birthday_shorthand="off" # --birthday_time on/off birthday_time="on" +# Date format to use when printing birthday +# --birthday_format "format" +birthday_format="+%a %d %b %Y %l:%M %p" + + # Color Blocks # Color block range diff --git a/neofetch b/neofetch index 710363f1..ad91dbc1 100755 --- a/neofetch +++ b/neofetch @@ -178,6 +178,11 @@ birthday_shorthand="off" # --birthday_time on/off birthday_time="on" +# Date format to use when printing birthday +# --birthday_format "format" +birthday_format="%a %d %b %Y %l:%M %p" + + # Color Blocks # Color block range @@ -1513,12 +1518,12 @@ getbirthday () { case "$os" in "Linux") birthday="$(ls -alct --full-time / | awk '/lost\+found/ {printf $6 " " $7}')" - date_cmd="$(date -d"$birthday" "+%a %d %b %Y %l:%M %p")" + date_cmd="$(date -d"$birthday" +"$birthday_format")" ;; "Mac OS X") birthday="$(ls -alctT /var/log/CDIS.custom | awk '{printf $6 " " $7 " " $9 " " $8}')" - date_cmd="$(date -j -f "%b %d %Y" "$birthday" "+%a %d %b %Y %l:%M %p")" + date_cmd="$(date -j -f "%b %d %Y" "$birthday" +"$birthday_format")" ;; *"BSD") @@ -1530,7 +1535,7 @@ getbirthday () { "FreeBSD"*) birthday="$(ls -alctT /etc/hostid | awk '{printf $6 " " $7 " " $9 " " $8}')" - date_cmd="$(date -j -f "%b %d %Y" "$birthday" "+%a %d %b %Y %l:%M %p")" + date_cmd="$(date -j -f "%b %d %Y" "$birthday" +"$birthday_format")" ;; "NetBSD"*) @@ -1546,7 +1551,7 @@ getbirthday () { "Windows") birthday="$(ls -alct --full-time /cygdrive/c/Windows/explorer.exe | awk '{printf $8 " " $9}')" - date_cmd="$(date -d"$birthday" "+%a %d %b %Y %l:%M %p")" + date_cmd="$(date -d"$birthday" +"$birthday_format")" ;; *) @@ -2302,6 +2307,7 @@ usage () { cat << EOF --song_shorthand on/off Print the Artist/Title on seperate lines --birthday_shorthand on/off Shorten the output of birthday --birthday_time on/off Enable/Disable showing the time in birthday output + --birthday_format format Format the birthday output. (Uses 'date' cmd format) Text Formatting: @@ -2400,6 +2406,7 @@ while [ "$1" ]; do --song_shorthand) song_shorthand="$2" ;; --birthday_shorthand) birthday_shorthand="$2" ;; --birthday_time) birthday_time="$2" ;; + --birthday_format) birthday_format="$2" ;; --disable) for func in "$@"; do case "$func" in diff --git a/neofetch.1 b/neofetch.1 index 6be97b8b..f623f32c 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -74,6 +74,9 @@ Shorten the output of birthday .TP .B \--birthday_time 'on/off' Enable/Disable showing the time in birthday output +.TP +.B \--birthday_format 'format' +Format the birthday output. (Uses 'date' cmd format) .SH TEXT FORMATTING .TP From 2787c1b68ce58693a2a9a8fbb6eeb5689d823a77 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 10:00:05 +1100 Subject: [PATCH 26/76] Changelog --- 1.4.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/1.4.md b/1.4.md index ce2666ba..254278d7 100644 --- a/1.4.md +++ b/1.4.md @@ -15,6 +15,19 @@ **Song**
- [Linux] Added support for Spotify. +**Birthday**
+- Added `--birthday_format` and `$birthday_format` to change the date format of the
+birthday function. The flag uses the `date` cmd's format options so see `man date`
+for a list. + +Example: + +```sh +neofetch --birthday_format "%D" +neofetch --birthday_format "%a %d %b %Y %l:%M %p" +neofetch --birthday_format "%c" +``` + ### Ascii - Added small ascii logo variants for Arch, Crux and Gentoo. From 52605060d16a2b6e038fd35399a14a36887c39e6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 10:01:57 +1100 Subject: [PATCH 27/76] Shorten if statement --- neofetch | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/neofetch b/neofetch index ad91dbc1..6ba753f1 100755 --- a/neofetch +++ b/neofetch @@ -1564,10 +1564,8 @@ getbirthday () { birthday=${birthday%:*} # Pretty output - if [ "$birthday_shorthand" == "off" ]; then - birthday="$date_cmd" - birthday=${birthday/ / } - fi + [ "$birthday_shorthand" == "off" ] && \ + birthday="${date_cmd/ / }" # Toggle showing the time [ "$birthday_time" == "off" ] && \ From fa4d318fadac55d26ce69b29fbab89edb169b337 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 10:16:25 +1100 Subject: [PATCH 28/76] Changelog --- 1.4.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/1.4.md b/1.4.md index 254278d7..dc860f4f 100644 --- a/1.4.md +++ b/1.4.md @@ -28,6 +28,9 @@ neofetch --birthday_format "%a %d %b %Y %l:%M %p" neofetch --birthday_format "%c" ``` +**Theme**
+- Fix incorrect theme detection on Cinnamon. + ### Ascii - Added small ascii logo variants for Arch, Crux and Gentoo. From b00904adafa927f1a8af578982376cb66745f39e Mon Sep 17 00:00:00 2001 From: Dylan Date: Sun, 6 Mar 2016 14:10:08 +1100 Subject: [PATCH 29/76] Another gpu substitution --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 6ba753f1..ed3fa814 100755 --- a/neofetch +++ b/neofetch @@ -910,6 +910,7 @@ getgpu () { gpu=${gpu/Seymour} gpu=${gpu/Richland} gpu=${gpu/Pitcairn} + gpu=${gpu/Hawaii} gpu=${gpu/ OEM} gpu=${gpu/ Cape Verde} gpu=${gpu/ \[} From f7ee916bfa1039e58acb7352a0453c513a65c07d Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 9 Mar 2016 22:10:03 +1100 Subject: [PATCH 30/76] Update README.md Added OS X install instructions --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 28fe9c8a..b346581a 100644 --- a/README.md +++ b/README.md @@ -151,6 +151,9 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 4. Install the package - `sudo apt-get install neofetch` +### OS X +1. Install `neofetch` with Homebrew + - `brew install neofetch` ### Others From 4c0b8a4c0a7e224b287878a4c8251453224af5a0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 9 Mar 2016 22:12:13 +1100 Subject: [PATCH 31/76] Update 1.4.md --- 1.4.md | 1 + 1 file changed, 1 insertion(+) diff --git a/1.4.md b/1.4.md index dc860f4f..afd6b361 100644 --- a/1.4.md +++ b/1.4.md @@ -6,6 +6,7 @@ ### Packages - Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** +- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/ ### Info From d51190a6d672ad1e4ec8edfa123e9d6e7b82eea2 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Wed, 9 Mar 2016 22:15:10 +1100 Subject: [PATCH 32/76] Fixed line regarding OS X Thanks iOS for deleting that... --- 1.4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.4.md b/1.4.md index afd6b361..7afd9676 100644 --- a/1.4.md +++ b/1.4.md @@ -6,7 +6,7 @@ ### Packages - Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** -- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/ +- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/iandrewt)** ### Info From 404c955e8f3bc8d0130c96a23c9399a70aa9dff6 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 9 Mar 2016 22:43:52 +1100 Subject: [PATCH 33/76] Added support for Alpine Linux --- README.md | 1 + ascii/distro/alpine | 19 +++++++++++++++++++ neofetch | 7 +++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 ascii/distro/alpine diff --git a/README.md b/README.md index 28fe9c8a..6eb47894 100644 --- a/README.md +++ b/README.md @@ -66,6 +66,7 @@ your distro's logo or any ascii art of your choice! ### Required dependencies: - `Bash 3.0+` + - Alpine Linux: You also need `ncurses`. - `xprop` \[1\] - `procps-ng` - Not required on OS X diff --git a/ascii/distro/alpine b/ascii/distro/alpine new file mode 100644 index 00000000..ce7524d2 --- /dev/null +++ b/ascii/distro/alpine @@ -0,0 +1,19 @@ +"\ +${c1} \`---------------------\` + \`-----------------------\` + .-------------------------. + .---------------------------. + \`-----------..------------------\` +\`----------.\` \`.----\`\`-----------\` +---------.\` \`.. \`.--------- +-------.\` \`..\` \`\`\` \`.------- +-----.\` \`.----.\` \`..\` \`.----- +---.\` \`.\` ------.\` \`..\` \`.--- +---..\`..--.\`--------.\`\`..--.\`\`.---- +\`---------------------------------\` + \`-------------------------------\` + .---------------------------. + .-------------------------. + \`-----------------------\` + \`---------------------\` +" diff --git a/neofetch b/neofetch index ed3fa814..deb9f34b 100755 --- a/neofetch +++ b/neofetch @@ -494,7 +494,7 @@ getuptime () { case "$os" in "Linux") case "$distro" in - "Puppy Linux"* | "Quirky Werewolf"* | "Precise Puppy"*) + "Puppy Linux"* | "Quirky Werewolf"* | "Precise Puppy"* | "Alpine Linux"*) uptime=$(uptime | awk -F ':[0-9]{2}+ |(, ){1}+' '{printf $2}') uptime=${uptime/ / } ;; @@ -618,6 +618,9 @@ getpackages () { elif type -p nix-env >/dev/null 2>&1; then packages="$(ls -d -1 /nix/store/*/ | wc -l)" + elif type -p apk >/dev/null 2>&1; then + packages="$(apk info | wc -l)" + elif type -p pacman-g2 >/dev/null 2>&1; then packages="$(pacman-g2 -Q | wc -l)" @@ -2035,7 +2038,7 @@ colors () { setcolors 3 2 4 5 7 ;; - "CRUX"* | "Chakra"* | "gNewSense"* | "SailfishOS"*) + "CRUX"* | "Chakra"* | "gNewSense"* | "SailfishOS"* | "Alpine"*) setcolors 4 5 7 ;; From b268d8ecaeecac34343d49d0e7ec16c0f6591e31 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 9 Mar 2016 22:54:58 +1100 Subject: [PATCH 34/76] Readme --- 1.4.md | 5 ++++- README.md | 20 +++++++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/1.4.md b/1.4.md index 7afd9676..dbf90883 100644 --- a/1.4.md +++ b/1.4.md @@ -6,7 +6,10 @@ ### Packages - Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** -- Added Homebrew package for OS X. Thanks **[@iandrewt](https://github.com/iandrewt)** +- Added Homebrew package for OS X. \[1\] Thanks **[@iandrewt](https://github.com/iandrewt)** + +\[1\] The homebrew package is still in the auditing and approval process and should be
+available in less than 24 hours. ### Info diff --git a/README.md b/README.md index 7dbcbcce..39abd069 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,12 @@ your distro's logo or any ascii art of your choice! - [Features](#features) - [Dependencies](#dependencies) - [Installation](#installation) + - [Arch Linux](#arch) + - [Gentoo / Funtoo](#gentoo--funtoo) + - [CRUX](#crux) + - [Debian / Ubuntu](#debian--ubuntu) + - [Mac OS X](#max-os-x) + - [Others](#others) - [Post Install](#post-install) - [Usage](#usage) - [Frequently Asked Questions](#frequently-asked-questions) @@ -113,6 +119,14 @@ how you can workaround them. https://github.com/dylanaraps/neofetch/wiki/Following-HEAD +- [Arch Linux](#arch) +- [Gentoo / Funtoo](#gentoo--funtoo) +- [CRUX](#crux) +- [Debian / Ubuntu](#debian--ubuntu) +- [Mac OS X](#max-os-x) +- [Others](#others) + + ### Arch 1. Install **[neofetch-git](https://aur.archlinux.org/packages/neofetch-git/)** from the aur. @@ -152,10 +166,14 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 4. Install the package - `sudo apt-get install neofetch` -### OS X +### Mac OS X 1. Install `neofetch` with Homebrew - `brew install neofetch` +Note: The homebrew package is still in the auditing and approval process and should be
+available in less than 24 hours. + + ### Others 1. Download the latest source at https://github.com/dylanaraps/neofetch From 3cd02ff72beac83c947f93944d0426452f15132b Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 9 Mar 2016 23:02:24 +1100 Subject: [PATCH 35/76] Add new changelog --- 1.4.md | 59 ---------------------------------------------------------- 1.5.md | 1 + 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 1.4.md create mode 100644 1.5.md diff --git a/1.4.md b/1.4.md deleted file mode 100644 index dbf90883..00000000 --- a/1.4.md +++ /dev/null @@ -1,59 +0,0 @@ -# Neofetch 1.4 - -- Renamed `fetch` to `neofetch`. Thanks for voting. -- Fetch now has a man page. (man neofetch) Thanks **[@konimex](https://github.com/konimex)** - -### Packages - -- Added Debian/Ubuntu package. Thanks **[@dawidd6](https://github.com/dawidd6)** -- Added Homebrew package for OS X. \[1\] Thanks **[@iandrewt](https://github.com/iandrewt)** - -\[1\] The homebrew package is still in the auditing and approval process and should be
-available in less than 24 hours. - -### Info - -**Battery**
-- Added support for NetBSD - -**Song**
-- [Linux] Added support for Spotify. - -**Birthday**
-- Added `--birthday_format` and `$birthday_format` to change the date format of the
-birthday function. The flag uses the `date` cmd's format options so see `man date`
-for a list. - -Example: - -```sh -neofetch --birthday_format "%D" -neofetch --birthday_format "%a %d %b %Y %l:%M %p" -neofetch --birthday_format "%c" -``` - -**Theme**
-- Fix incorrect theme detection on Cinnamon. - -### 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. - -Example of small ascii logo: - -![CRUX](https://ipfs.pics/ipfs/QmSpadVHtBPRBUJEiiztqkXqfhE2fuGS5t8bzsbxWUYaXA) - -### Stdout -- Don't create config file when using `--stdout`. -- Reimplent `--stdout_separator` and `$stdout_separator` which allow you to change
-the separator between the info. - -Example: - -```sh -# Display memory, battery and disk in a single line separated by " | " -# This output can then be used in lemonbar etc. -neofetch --stdout memory battery disk --stdout_separator " | " -``` diff --git a/1.5.md b/1.5.md new file mode 100644 index 00000000..00a85092 --- /dev/null +++ b/1.5.md @@ -0,0 +1 @@ +# Neofetch 1.5 From 076db2b68d223e22c2d830dd87e0028d6710a202 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 08:57:21 +1100 Subject: [PATCH 36/76] Disk usage: Limit usage to local disks. Closes #128 --- 1.5.md | 5 +++++ neofetch | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/1.5.md b/1.5.md index 00a85092..806f6301 100644 --- a/1.5.md +++ b/1.5.md @@ -1 +1,6 @@ # Neofetch 1.5 + +### Info + +**Disk Usage**
+- Only display usage of local disks. diff --git a/neofetch b/neofetch index deb9f34b..23b48634 100755 --- a/neofetch +++ b/neofetch @@ -1358,12 +1358,12 @@ getfont () { getdisk () { # df flags case "$os" in - "Linux" | "Windows") df_flags="-h --total" ;; - "Mac OS X") df_flags="-H /" ;; + "Linux" | "Windows") df_flags="-h -l --total" ;; + "Mac OS X") df_flags="-H / -l" ;; *"BSD") case "$os" in - "FreeBSD") df_flags="-h -c" ;; + "FreeBSD") df_flags="-h -c -l" ;; *) disk="Unknown"; return ;; esac ;; From a99f3723db31adaa2e7fc7f7bf3078fb3aa923dd Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 09:00:32 +1100 Subject: [PATCH 37/76] Fix broken anchor link in readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 39abd069..bdcef6e0 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ your distro's logo or any ascii art of your choice! - [Gentoo / Funtoo](#gentoo--funtoo) - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) - - [Mac OS X](#max-os-x) + - [Mac OS X](#mac-os-x) - [Others](#others) - [Post Install](#post-install) - [Usage](#usage) @@ -123,7 +123,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - [Gentoo / Funtoo](#gentoo--funtoo) - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) -- [Mac OS X](#max-os-x) +- [Mac OS X](#mac-os-x) - [Others](#others) From ebcf31c777d62fec1e8385f934ec5fcb919cb5e3 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 14:36:02 +1100 Subject: [PATCH 38/76] Added support for SteamOS --- ascii/distro/steamos | 20 ++++++++++++++++++++ neofetch | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 ascii/distro/steamos diff --git a/ascii/distro/steamos b/ascii/distro/steamos new file mode 100644 index 00000000..49fcc872 --- /dev/null +++ b/ascii/distro/steamos @@ -0,0 +1,20 @@ +"\ +${c2} .,,,,. + .,'onNMMMMMNNnn',. + .'oNMANKMMMMMMMMMMMNNn'. + .'ANMMMMMMMXKNNWWWPFFWNNMNn. + ;NNMMMMMMMMMMNWW'' ,.., 'WMMM, + ;NMMMMV+##+VNWWW' .+;'':+, 'WMW, +,VNNWP+${c1}######${c2}+WW, ${c1}+: ${c2}:+, +MMM, +'${c1}+#############, +. ,+' ${c2}+NMMM +${c1} '*#########*' '*,,*' ${c2}.+NMMMM. +${c1} \`'*###*' ,.,;###${c2}+WNM, +${c1} .,;;, .;##########${c2}+W +${c1},',. '; ,+##############' + '###+. :,. .,; ,###############' + '####.. \`'' .,###############' + '#####+++################' + '*##################*' + ''*##########*'' + '''''' +" diff --git a/neofetch b/neofetch index 23b48634..af670572 100755 --- a/neofetch +++ b/neofetch @@ -2060,7 +2060,7 @@ colors () { setcolors 7 4 1 ;; - "Gentoo"* | "Funtoo"*) + "Gentoo"* | "Funtoo"* | "SteamOS"*) setcolors 7 5 ;; From 77a8f89f168e00c5d8144ac77f5d8ce2016daeba Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 14:36:49 +1100 Subject: [PATCH 39/76] Changed default gap to 2 spaces --- config/config | 2 +- neofetch | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config b/config/config index 0f42e5d5..2fa40574 100644 --- a/config/config +++ b/config/config @@ -266,7 +266,7 @@ image_size="auto" # Right gap between image and text # --gap num -gap=4 +gap=2 # Image offsets # --xoffset px diff --git a/neofetch b/neofetch index af670572..306461d2 100755 --- a/neofetch +++ b/neofetch @@ -286,7 +286,7 @@ image_size="auto" # Right gap between image and text # --gap num -gap=4 +gap=2 # Image offsets # --xoffset px From 153fb593a05f50ea316972f3f08987aa7cdc4e76 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 14:37:53 +1100 Subject: [PATCH 40/76] Changelog --- 1.5.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/1.5.md b/1.5.md index 806f6301..37227229 100644 --- a/1.5.md +++ b/1.5.md @@ -1,5 +1,11 @@ # Neofetch 1.5 +- Changed default gap size to `2`. + +### OS + +- Added support for `SteamOS`. + ### Info **Disk Usage**
From ff5903fdfacc4080a7edfe4edc6a49a90aad0bd2 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 14:49:41 +1100 Subject: [PATCH 41/76] Update kaos logo --- ascii/distro/kaos | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/ascii/distro/kaos b/ascii/distro/kaos index b5b7c591..d5d06d91 100644 --- a/ascii/distro/kaos +++ b/ascii/distro/kaos @@ -1,18 +1,18 @@ "\ -${c1}████████ ████████ - ██████ ██████ - ████ ████ - █ █ - █ -${c1} █ ${c2} ████████ ████████ -${c1} █ ${c2} ██████ ██████ -${c1} █ ${c2} ████ ████ -${c1} █ ${c2} █ █ -${c1} █ ${c2} █ -${c1} ${c3}███████ ███████ -${c1} ${c3} █████ █████${c2} █ -${c1} █${c3} ███ ███ ${c2} █ -${c1} █ ${c3} █ ${c2} █ -${c1} █ ${c3}█ ${c2} █ -${c1} █ ${c3}█ ${c2} █ +${c1} .. + ..... ..OSSAAAAAAA.. + .KKKKSS. .SSAAAAAAAAAAA. +.KKKKKSO. .SAAAAAAAAAA... +KKKKKKS. .OAAAAAAAA. +KKKKKKS. .OAAAAAA. +KKKKKKS. .SSAA.. +.KKKKKS..OAAAAAAAAAAAA........ + DKKKKO.=AA=========A===AASSSO.. + AKKKS.==========AASSSSAAAAAASS. + .=KKO..========ASS.....SSSSASSSS. + .KK. .ASS..O.. =SSSSAOSS: + .OK. .ASSSSSSSO...=A.SSA. + .K ..SSSASSSS.. ..SSA. + .SSS.AAKAKSSKA. + .SSS....S.. " From 5f4c7dead8d8a0287b335b1d1ce650391437e99e Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 14:50:19 +1100 Subject: [PATCH 42/76] Changelog --- 1.5.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/1.5.md b/1.5.md index 37227229..e6d829b2 100644 --- a/1.5.md +++ b/1.5.md @@ -10,3 +10,7 @@ **Disk Usage**
- Only display usage of local disks. + +### Ascii + +- Kaos: Update ascii logo to the new logo. From 1b63672d35e037193a38847a51fdc7025a3afa7c Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 18:48:41 +1100 Subject: [PATCH 43/76] Remove stray backslash --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 306461d2..c1be7cec 100755 --- a/neofetch +++ b/neofetch @@ -1094,7 +1094,7 @@ getsong () { dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 \ org.freedesktop.DBus.Properties.Get string:'org.mpris.MediaPlayer2.Player' string:'Metadata' |\ awk -F 'string "' '/string|array/ {printf "%s",$2; next}{print ""}' |\ - awk -F '"' '/artist|title/ {printf $2 " - "}'\ + awk -F '"' '/artist|title/ {printf $2 " - "}' )" song=${song% - } song=${song/'('*} From f845553a801856889ebc77e644007f2e27afbc74 Mon Sep 17 00:00:00 2001 From: Dylan Date: Thu, 10 Mar 2016 19:21:22 +1100 Subject: [PATCH 44/76] Readme --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bdcef6e0..f7bcf776 100644 --- a/README.md +++ b/README.md @@ -362,11 +362,11 @@ alias fetch2="fetch \ #### How do I enable screenfetch mode? -Launching the script with `--ascii distro` or setting `ascii="distro"` and `image="ascii"`
+Launching the script with `--ascii` or setting `ascii="distro"` and `image="ascii"`
inside the config file will launch the script in "screenfetch mode". The script will
display your distro's ascii next to the info, exactly like screenfetch. -**NOTE:** If you don't have `w3m-img` or `imagemagick` installed screenfetch mode will be
+**NOTE:** If you **don't** have `w3m-img` or `imagemagick` installed screenfetch mode will be
used automatically ![arch](http://i.imgur.com/uCMjgf6.png) @@ -458,7 +458,7 @@ Thanks to: - [Screenfetch](https://github.com/KittyKatt/screenFetch): - I've used some snippets as a base for a few functions in this script. - - I've used the ascii art from here. + - Most of the ascii art. - [ufetch](https://github.com/jschx/ufetch): Tiny ascii logos - [@metakirby5](https://github.com/metakirby5): Providing great feedback as well as ideas for the script. - [@jrgz](https://github.com/jrgz): Helping me test the Mac OS X version. From 5b6196f1825a3ac7dd69e7eca11da3fc6aba4fc0 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 08:27:00 +1100 Subject: [PATCH 45/76] added ability to shorten cpu output usage: --cpu_shorthand (name, model, name_model, speed) also edited config file to suit --- config/config | 5 +++++ neofetch | 29 +++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/config/config b/config/config index 2fa40574..58fbde9f 100644 --- a/config/config +++ b/config/config @@ -93,6 +93,11 @@ shell_version="off" # scaling_current, scaling_min, scaling_max speed_type="max" +# CPU shorthand +# Decice to show name only, model only, or speed only +# --cpu_shorthand name, model, name_model, speed, off +cpu_shorthand="off" + # GPU diff --git a/neofetch b/neofetch index c1be7cec..62840bcd 100755 --- a/neofetch +++ b/neofetch @@ -113,6 +113,11 @@ shell_version="off" # scaling_current, scaling_min, scaling_max speed_type="max" +# CPU shorthand +# Decice to show name only, model only, or speed only +# --cpu_shorthand name, model, name_model, speed, off +cpu_shorthand="off" + # GPU @@ -855,6 +860,27 @@ 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%-*} + ;; + + "model") + cpu=${cpu#*-} + cpu=${cpu%% *} + ;; + + "name_model") + cpu=${cpu%@*} + cpu=${cpu# } + ;; + + "speed") + cpu=${cpu#*@ } + ;; + esac } # }}} @@ -2295,6 +2321,8 @@ usage () { cat << EOF Possible values: current, min, max, bios, scaling_current, scaling_min, scaling_max NOTE: This only support Linux with cpufreq. + --cpu_shorthand type Shorten the output of CPU + Possible values: name, model, name_model, speed --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU @@ -2396,6 +2424,7 @@ while [ "$1" ]; do --speed_type) speed_type="$2" ;; --kernel_shorthand) kernel_shorthand="$2" ;; --uptime_shorthand) uptime_shorthand="$2" ;; + --cpu_shorthand) cpu_shorthand="$2" ;; --gpu_shorthand) gpu_shorthand="$2" ;; --gtk_shorthand) gtk_shorthand="$2" ;; --gtk2) gtk2="$2" ;; From e0269fb9b6e91d0dc776a7151f696cbe28d85773 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 08:49:01 +1100 Subject: [PATCH 46/76] added documentation for cpu_shorthand option --- 1.5.md | 2 ++ README.md | 2 ++ neofetch.1 | 5 +++++ 3 files changed, 9 insertions(+) diff --git a/1.5.md b/1.5.md index e6d829b2..2845aa26 100644 --- a/1.5.md +++ b/1.5.md @@ -10,6 +10,8 @@ **Disk Usage**
- Only display usage of local disks. +**CPU Information**
+- Option to shorten CPU name to just name, model, name & model, or speed ### Ascii diff --git a/README.md b/README.md index f7bcf776..981e692b 100644 --- a/README.md +++ b/README.md @@ -269,6 +269,8 @@ alias fetch2="fetch \ Possible values: current, min, max, bios, scaling_current, scaling_min, scaling_max NOTE: This only support Linux with cpufreq. + --cpu_shorthand type Shorten the output of CPU + Possible values: name, model, name_model, speed --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU diff --git a/neofetch.1 b/neofetch.1 index f623f32c..0e8f9bdf 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -33,6 +33,11 @@ scaling_current, scaling_min, scaling_max .br NOTE: This only support Linux with cpufreq. .TP +.B \--cpu_shorthand 'type' +Shorten the output of CPU +.br +Possible values: name, model, name_model, speed +.TP .B \--kernel_shorthand 'on/off' Shorten the output of kernel .TP From d1f7c47e0c2972168589c1c7aed255dd706d9864 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 10:33:37 +1100 Subject: [PATCH 47/76] changed cpu_frequency outputs with @dylanaraps suggestions --- 1.5.md | 2 +- README.md | 2 +- config/config | 4 ++-- neofetch | 31 +++++++++++++++++-------------- neofetch.1 | 2 +- 5 files changed, 22 insertions(+), 19 deletions(-) diff --git a/1.5.md b/1.5.md index 2845aa26..8bde6482 100644 --- a/1.5.md +++ b/1.5.md @@ -11,7 +11,7 @@ **Disk Usage**
- Only display usage of local disks. **CPU Information**
-- Option to shorten CPU name to just name, model, name & model, or speed +- Option to shorten CPU name to just name, speed, tiny, on, or off ### Ascii diff --git a/README.md b/README.md index 981e692b..87e79c1f 100644 --- a/README.md +++ b/README.md @@ -270,7 +270,7 @@ alias fetch2="fetch \ scaling_current, scaling_min, scaling_max NOTE: This only support Linux with cpufreq. --cpu_shorthand type Shorten the output of CPU - Possible values: name, model, name_model, speed + Possible values: name, speed, tiny, on, off --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU diff --git a/config/config b/config/config index 58fbde9f..6026ab9e 100644 --- a/config/config +++ b/config/config @@ -94,8 +94,8 @@ shell_version="off" speed_type="max" # CPU shorthand -# Decice to show name only, model only, or speed only -# --cpu_shorthand name, model, name_model, speed, off +# Decice to show name only, speed only, or short info +# --cpu_shorthand name, speed, tiny, on, off cpu_shorthand="off" diff --git a/neofetch b/neofetch index 62840bcd..f0a7b4ae 100755 --- a/neofetch +++ b/neofetch @@ -114,8 +114,8 @@ shell_version="off" speed_type="max" # CPU shorthand -# Decice to show name only, model only, or speed only -# --cpu_shorthand name, model, name_model, speed, off +# Decice to show name only, speed only, or short info +# --cpu_shorthand name, speed, tiny, on, off cpu_shorthand="off" @@ -864,22 +864,25 @@ getcpu () { # Make the output of cpu shorter case "$cpu_shorthand" in "name") - cpu=${cpu%-*} - ;; - - "model") - cpu=${cpu#*-} - cpu=${cpu%% *} - ;; - - "name_model") - cpu=${cpu%@*} - cpu=${cpu# } + cpu=${cpu/@*} ;; "speed") cpu=${cpu#*@ } ;; + + "on") + cpu=${cpu/Intel } + cpu=${cpu/Core } + cpu=${cpu/AMD } + ;; + + "tiny") + cpu=${cpu/Intel } + cpu=${cpu/Core } + cpu=${cpu/AMD } + cpu=${cpu/@*} + ;; esac } @@ -2322,7 +2325,7 @@ usage () { cat << EOF scaling_current, scaling_min, scaling_max NOTE: This only support Linux with cpufreq. --cpu_shorthand type Shorten the output of CPU - Possible values: name, model, name_model, speed + Possible values: name, speed, tiny, on, off --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU diff --git a/neofetch.1 b/neofetch.1 index 0e8f9bdf..28f43ac2 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -36,7 +36,7 @@ NOTE: This only support Linux with cpufreq. .B \--cpu_shorthand 'type' Shorten the output of CPU .br -Possible values: name, model, name_model, speed +Possible values: name, speed, tiny, on, off .TP .B \--kernel_shorthand 'on/off' Shorten the output of kernel From 467ca792c99aa5247b36598491318b6b5a4ba5cb Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 10:39:05 +1100 Subject: [PATCH 48/76] fixed duplicate case --- neofetch | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/neofetch b/neofetch index f0a7b4ae..effaf8a7 100755 --- a/neofetch +++ b/neofetch @@ -871,17 +871,15 @@ getcpu () { cpu=${cpu#*@ } ;; - "on") + "on" | "tiny") cpu=${cpu/Intel } cpu=${cpu/Core } + cpu=${cpu/Core? Duo } cpu=${cpu/AMD } - ;; - "tiny") - cpu=${cpu/Intel } - cpu=${cpu/Core } - cpu=${cpu/AMD } - cpu=${cpu/@*} + case "$cpu_shorthand" in + "tiny") cpu${cpu/@*} ;; + esac ;; esac } From 1ba6ca32e20e8eb403353ae90da23f190dc7ce97 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Mar 2016 10:47:08 +1100 Subject: [PATCH 49/76] Update 1.5.md --- 1.5.md | 1 + 1 file changed, 1 insertion(+) diff --git a/1.5.md b/1.5.md index 8bde6482..f3f82920 100644 --- a/1.5.md +++ b/1.5.md @@ -10,6 +10,7 @@ **Disk Usage**
- Only display usage of local disks. + **CPU Information**
- Option to shorten CPU name to just name, speed, tiny, on, or off From 75bf641341450a6e11574918ff11d0be1d0fa3b3 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Mar 2016 10:48:16 +1100 Subject: [PATCH 50/76] Update 1.5.md --- 1.5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.5.md b/1.5.md index f3f82920..2e45852d 100644 --- a/1.5.md +++ b/1.5.md @@ -11,7 +11,7 @@ **Disk Usage**
- Only display usage of local disks. -**CPU Information**
+**CPU**
- Option to shorten CPU name to just name, speed, tiny, on, or off ### Ascii From 35f765ce40a8eccb34942373c4e32891b98a588f Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Mar 2016 10:49:23 +1100 Subject: [PATCH 51/76] Update 1.5.md --- 1.5.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/1.5.md b/1.5.md index 2e45852d..761c49f8 100644 --- a/1.5.md +++ b/1.5.md @@ -12,7 +12,8 @@ - Only display usage of local disks. **CPU**
-- Option to shorten CPU name to just name, speed, tiny, on, or off +- Add `cpu_shorthand` to shorten the output of CPU. +- Takes these values: name, speed tiny, on, off ### Ascii From c276f24d961bb4f60a3f942c258e9c8d2d425221 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Mar 2016 10:49:54 +1100 Subject: [PATCH 52/76] Update 1.5.md --- 1.5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.5.md b/1.5.md index 761c49f8..f4b35824 100644 --- a/1.5.md +++ b/1.5.md @@ -13,7 +13,7 @@ **CPU**
- Add `cpu_shorthand` to shorten the output of CPU. -- Takes these values: name, speed tiny, on, off +- Takes these values: `name`, `speed`, `tiny`, `on`, `off` ### Ascii From 72ea6113cdff6ed18010022099e7c46789c59b0d Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 11 Mar 2016 12:37:59 +1100 Subject: [PATCH 53/76] Neofetch is now in Homebrew! --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 87e79c1f..0755d5f7 100644 --- a/README.md +++ b/README.md @@ -170,9 +170,6 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 1. Install `neofetch` with Homebrew - `brew install neofetch` -Note: The homebrew package is still in the auditing and approval process and should be
-available in less than 24 hours. - ### Others From 439dfe91f58cdf45921722f72863279a08c06057 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Mar 2016 12:39:42 +1100 Subject: [PATCH 54/76] Update 1.5.md --- 1.5.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/1.5.md b/1.5.md index f4b35824..68bfff37 100644 --- a/1.5.md +++ b/1.5.md @@ -12,7 +12,7 @@ - Only display usage of local disks. **CPU**
-- Add `cpu_shorthand` to shorten the output of CPU. +- Add `cpu_shorthand` to shorten the output of CPU. Thanks **[@iandrewt](https://github.com/iandrewt)** - Takes these values: `name`, `speed`, `tiny`, `on`, `off` ### Ascii From 211b326e2c90ecfdd885953464d95e97f7116f9c Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 11 Mar 2016 13:59:22 +1100 Subject: [PATCH 55/76] Update --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index effaf8a7..9d7ce12d 100755 --- a/neofetch +++ b/neofetch @@ -2323,7 +2323,7 @@ usage () { cat << EOF scaling_current, scaling_min, scaling_max NOTE: This only support Linux with cpufreq. --cpu_shorthand type Shorten the output of CPU - Possible values: name, speed, tiny, on, off + Possible values: name, speed, tiny, on, off --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) --gpu_shorthand on/off Shorten the output of GPU From 5f68746508c757f0b5579454c9e0e72bbe434f89 Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 11 Mar 2016 15:20:34 +1100 Subject: [PATCH 56/76] Update dependencies inside script --- neofetch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 9d7ce12d..cb84eafb 100755 --- a/neofetch +++ b/neofetch @@ -13,7 +13,8 @@ # Displaying Images: w3m + w3m-img # Image Cropping: ImageMagick # [ Linux / BSD ] Wallpaper Display: feh, nitrogen or gsettings -# [ Linux / BSD ] Current Song: mpc or cmus +# [ Linux / BSD ] Current Song: mpc, cmus, moc +# [ Linux ] Current Song: spotify # [ Linux / BSD ] Resolution detection: xorg-xdpyinfo # # Created by Dylan Araps From e30e6ab383db39a2dbdbc4e7f9d507dafcdb53e3 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 11 Mar 2016 15:03:28 +0700 Subject: [PATCH 57/76] Added installation instructions for Fedora --- README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/README.md b/README.md index 0755d5f7..825a2720 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ your distro's logo or any ascii art of your choice! - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) - [Mac OS X](#mac-os-x) + - [Fedora](#fedora) - [Others](#others) - [Post Install](#post-install) - [Usage](#usage) @@ -170,6 +171,13 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 1. Install `neofetch` with Homebrew - `brew install neofetch` +### Fedora +1. Make sure you have installed `dnf-plugins-core` + - `sudo dnf install dnf-plugins-core` +2. Enable COPR repository + - `sudo dnf copr enable konimex/neofetch` +3. Install the package + - `sudo dnf install neofetch` ### Others From 64722619c5f071e955261d11bf52899a3d1003ed Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 11 Mar 2016 19:40:13 +1100 Subject: [PATCH 58/76] Changelog --- 1.5.md | 4 ++++ README.md | 5 +++++ 2 files changed, 9 insertions(+) diff --git a/1.5.md b/1.5.md index 68bfff37..421d7372 100644 --- a/1.5.md +++ b/1.5.md @@ -6,6 +6,10 @@ - Added support for `SteamOS`. +### Packages + +- Neofetch is now packaged for `Fedora` and `Fedora` based distros. Thanks **[@konimex](https://github.com/konimex)**. + ### Info **Disk Usage**
diff --git a/README.md b/README.md index 825a2720..9c577728 100644 --- a/README.md +++ b/README.md @@ -124,6 +124,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - [Gentoo / Funtoo](#gentoo--funtoo) - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) +- [Fedora](#fedora) - [Mac OS X](#mac-os-x) - [Others](#others) @@ -156,6 +157,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 4. Install the package - `sudo prt-get depinst neofetch` + ### Debian / Ubuntu 1. Add the 3rd party repo @@ -167,10 +169,12 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 4. Install the package - `sudo apt-get install neofetch` + ### Mac OS X 1. Install `neofetch` with Homebrew - `brew install neofetch` + ### Fedora 1. Make sure you have installed `dnf-plugins-core` - `sudo dnf install dnf-plugins-core` @@ -179,6 +183,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 3. Install the package - `sudo dnf install neofetch` + ### Others 1. Download the latest source at https://github.com/dylanaraps/neofetch From 00eab870e7872fe709307447470f7e9e9b14ca4b Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 11 Mar 2016 19:41:42 +1100 Subject: [PATCH 59/76] Change ordering of install OS --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9c577728..b679ed9f 100644 --- a/README.md +++ b/README.md @@ -22,8 +22,8 @@ your distro's logo or any ascii art of your choice! - [Gentoo / Funtoo](#gentoo--funtoo) - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) - - [Mac OS X](#mac-os-x) - [Fedora](#fedora) + - [Mac OS X](#mac-os-x) - [Others](#others) - [Post Install](#post-install) - [Usage](#usage) @@ -170,11 +170,6 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - `sudo apt-get install neofetch` -### Mac OS X -1. Install `neofetch` with Homebrew - - `brew install neofetch` - - ### Fedora 1. Make sure you have installed `dnf-plugins-core` - `sudo dnf install dnf-plugins-core` @@ -184,6 +179,11 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - `sudo dnf install neofetch` +### Mac OS X +1. Install `neofetch` with Homebrew + - `brew install neofetch` + + ### Others 1. Download the latest source at https://github.com/dylanaraps/neofetch From 75a5f3f41ac76787a15ea822889ba81e3aa93417 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 20:48:06 +1100 Subject: [PATCH 60/76] added tiny option to --gpu_shorthand removes 'Graphics', 'GeForce' and 'Radeon' from output --- 1.5.md | 4 ++++ README.md | 2 +- config/config | 2 +- neofetch | 36 +++++++++++++++++++++++------------- neofetch.1 | 2 +- 5 files changed, 30 insertions(+), 16 deletions(-) diff --git a/1.5.md b/1.5.md index e6d829b2..00a4bac3 100644 --- a/1.5.md +++ b/1.5.md @@ -11,6 +11,10 @@ **Disk Usage**
- Only display usage of local disks. +**GPU**
+- Add `tiny` option to shorten output of GPU even further. +- Removes words 'Graphics', 'GeForce' and 'Radeon' + ### Ascii - Kaos: Update ascii logo to the new logo. diff --git a/README.md b/README.md index f7bcf776..77b1df3c 100644 --- a/README.md +++ b/README.md @@ -271,7 +271,7 @@ alias fetch2="fetch \ NOTE: This only support Linux with cpufreq. --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --gpu_shorthand on/off Shorten the output of GPU + --gpu_shorthand on/off Shorten the output of GPU (tiny, on, off) --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/icons output --gtk3 on/off Enable/Disable gtk3 theme/icons output diff --git a/config/config b/config/config index 2fa40574..ab9a1332 100644 --- a/config/config +++ b/config/config @@ -97,7 +97,7 @@ speed_type="max" # GPU # Shorten output of the getgpu funcion -# --gpu_shorthand on/off +# --gpu_shorthand on/off/tiny gpu_shorthand="on" diff --git a/neofetch b/neofetch index c1be7cec..c94fe63b 100755 --- a/neofetch +++ b/neofetch @@ -117,7 +117,7 @@ speed_type="max" # GPU # Shorten output of the getgpu funcion -# --gpu_shorthand on/off +# --gpu_shorthand on/off/tiny gpu_shorthand="on" @@ -972,17 +972,27 @@ getgpu () { ;; esac - if [ "$gpu_shorthand" == "on" ]; then - gpu=${gpu// Rev\. ?} - gpu=${gpu//AMD*\/ATI\]/AMD} - gpu=${gpu// Tahiti} - gpu=${gpu// PRO} - gpu=${gpu// OEM} - gpu=${gpu// Mars} - gpu=${gpu// Series} - gpu=${gpu// Controller} - gpu=${gpu/\/*} - fi + case "$gpu_shorthand" in + "on" | "tiny") + gpu=${gpu// Rev\. ?} + gpu=${gpu//AMD*\/ATI\]/AMD} + gpu=${gpu// Tahiti} + gpu=${gpu// PRO} + gpu=${gpu// OEM} + gpu=${gpu// Mars} + gpu=${gpu// Series} + gpu=${gpu// Controller} + gpu=${gpu/\/*} + + case "$gpu_shorthand" in + "tiny") + gpu=${gpu/Graphics } + gpu=${gpu/GeForce } + gpu=${gpu/Radeon } + ;; + esac + ;; + esac gpu="${gpu}${count}" } @@ -2297,7 +2307,7 @@ usage () { cat << EOF NOTE: This only support Linux with cpufreq. --kernel_shorthand on/off Shorten the output of kernel --uptime_shorthand on/off Shorten the output of uptime (tiny, on, off) - --gpu_shorthand on/off Shorten the output of GPU + --gpu_shorthand on/off Shorten the output of GPU (tiny, on, off) --gtk_shorthand on/off Shorten output of gtk theme/icons --gtk2 on/off Enable/Disable gtk2 theme/icons output --gtk3 on/off Enable/Disable gtk3 theme/icons output diff --git a/neofetch.1 b/neofetch.1 index f623f32c..607e33c6 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -40,7 +40,7 @@ Shorten the output of kernel Shorten the output of uptime (tiny, on, off) .TP .B \--gpu_shorthand 'on/off' -Shorten the output of GPU +Shorten the output of GPU (tiny, on, off) .TP .B \--gtk_shorthand 'on/off' Shorten output of gtk theme/icons From 041b3af18cabc2f376f78bf2a88e0b395fd0a787 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 20:58:46 +1100 Subject: [PATCH 61/76] fixed merge conflict --- 1.5.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/1.5.md b/1.5.md index 00a4bac3..e6d829b2 100644 --- a/1.5.md +++ b/1.5.md @@ -11,10 +11,6 @@ **Disk Usage**
- Only display usage of local disks. -**GPU**
-- Add `tiny` option to shorten output of GPU even further. -- Removes words 'Graphics', 'GeForce' and 'Radeon' - ### Ascii - Kaos: Update ascii logo to the new logo. From 3bb97bc04cb5ab2c80c746e654925d954812912f Mon Sep 17 00:00:00 2001 From: Dylan Date: Fri, 11 Mar 2016 21:01:23 +1100 Subject: [PATCH 62/76] Changelog' --- 1.5.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/1.5.md b/1.5.md index 421d7372..443e5793 100644 --- a/1.5.md +++ b/1.5.md @@ -19,6 +19,9 @@ - Add `cpu_shorthand` to shorten the output of CPU. Thanks **[@iandrewt](https://github.com/iandrewt)** - Takes these values: `name`, `speed`, `tiny`, `on`, `off` +**GPU**
+- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. Thanks **[@iandrewt](https://github.com/iandrewt)** + ### Ascii - Kaos: Update ascii logo to the new logo. From 3ed4c436368ea385640480d4131a7f9d91ba425c Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Fri, 11 Mar 2016 21:10:21 +1100 Subject: [PATCH 63/76] fixed bash dependency in preamble it still read `Bash 4.0+`, changed to `Bash 3.0+` --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index 08930e26..1ff3eead 100755 --- a/neofetch +++ b/neofetch @@ -5,7 +5,7 @@ # https://github.com/dylanaraps/neofetch # # Required Dependencies: -# Bash 4.0+ +# Bash 3.0+ # xprop # [Linux / BSD / Windows] Uptime detection: procps or procps-ng # From 2f66347189f19bd64e8c3712ca16b9662c05f06b Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Fri, 11 Mar 2016 17:30:22 +0700 Subject: [PATCH 64/76] Added installation instructions for RHEL and CentOS --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 22804fea..96445b95 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,7 @@ your distro's logo or any ascii art of your choice! - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) - [Fedora](#fedora) + - [RHEL / CentOS](#rhel--centos) - [Mac OS X](#mac-os-x) - [Others](#others) - [Post Install](#post-install) @@ -125,6 +126,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD - [CRUX](#crux) - [Debian / Ubuntu](#debian--ubuntu) - [Fedora](#fedora) +- [RHEL / CentOS](#rhel--centos) - [Mac OS X](#mac-os-x) - [Others](#others) @@ -178,6 +180,14 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD 3. Install the package - `sudo dnf install neofetch` +### RHEL / CentOS + +1. Change your working directory to `/etc/yum.repos.d` + - `cd /etc/yum.repos.d` +2. Fetch the repo file + - `wget https://copr.fedorainfracloud.org/coprs/konimex/neofetch/repo/epel-7/konimex-neofetch-epel-7.repo` +3. Install the package + - `sudo yum install neofetch` ### Mac OS X 1. Install `neofetch` with Homebrew From ed144aea5449e3ca08ea8c3b7f3da1843177dc68 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Fri, 11 Mar 2016 03:05:40 -0800 Subject: [PATCH 65/76] Update 1.5.md --- 1.5.md | 1 + 1 file changed, 1 insertion(+) diff --git a/1.5.md b/1.5.md index 443e5793..d9fd6f9b 100644 --- a/1.5.md +++ b/1.5.md @@ -9,6 +9,7 @@ ### Packages - Neofetch is now packaged for `Fedora` and `Fedora` based distros. Thanks **[@konimex](https://github.com/konimex)**. +- Added installation instructions for RHEL and CentOS. Thanks **[@konimex](https://github.com/konimex)**. ### Info From 641470ccd7746c18cc4f9355ef61674357029742 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 10:17:26 +1100 Subject: [PATCH 66/76] added working birthday function for OS X --- neofetch | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 1ff3eead..2799627c 100755 --- a/neofetch +++ b/neofetch @@ -1564,8 +1564,23 @@ getbirthday () { ;; "Mac OS X") - birthday="$(ls -alctT /var/log/CDIS.custom | awk '{printf $6 " " $7 " " $9 " " $8}')" - date_cmd="$(date -j -f "%b %d %Y" "$birthday" +"$birthday_format")" + birthday="$(ls -lUT /var/log/install.log | awk '{printf $6 " " $7 " " $9 " " $8}')" + + # Split the string into Date + time + time=${birthday/*???? } + birthday=${birthday/$time} + + case "${time/:*}" in + 0? | 10 | 11) + time+=" AM" + ;; + + *) + time+=" PM" + ;; + esac + birthday+="$time" + birthday_shorthand="on" ;; *"BSD") @@ -1603,7 +1618,7 @@ getbirthday () { esac # Strip seconds from time output - birthday=${birthday%:*} + birthday=${birthday/:?? /} # Pretty output [ "$birthday_shorthand" == "off" ] && \ From 74f5f765697319b4dd6ecb46543184a39d5c1157 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 10:25:19 +1100 Subject: [PATCH 67/76] fixed spacing between time and AM/PM --- neofetch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/neofetch b/neofetch index 2799627c..da9a6fc9 100755 --- a/neofetch +++ b/neofetch @@ -1572,11 +1572,11 @@ getbirthday () { case "${time/:*}" in 0? | 10 | 11) - time+=" AM" + time+=" AM" ;; *) - time+=" PM" + time+=" PM" ;; esac birthday+="$time" @@ -1618,7 +1618,7 @@ getbirthday () { esac # Strip seconds from time output - birthday=${birthday/:?? /} + birthday=${birthday/:?? / } # Pretty output [ "$birthday_shorthand" == "off" ] && \ From c4ede64a5d727287da77e9005f1ac37b6bd3bf2e Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 12 Mar 2016 10:27:01 +1100 Subject: [PATCH 68/76] Changelog --- 1.5.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/1.5.md b/1.5.md index d9fd6f9b..16eb2544 100644 --- a/1.5.md +++ b/1.5.md @@ -23,6 +23,9 @@ **GPU**
- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. Thanks **[@iandrewt](https://github.com/iandrewt)** +**Birthday**
+- Fixed the birthday function on OS X, it apparently wasn't working from the start. Thanks **[@iandrewt](https://github.com/iandrewt)** + ### Ascii - Kaos: Update ascii logo to the new logo. From afc590aed0183d7c5264b6adf9445ae8f52e2033 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 12 Mar 2016 17:33:07 +1100 Subject: [PATCH 69/76] Add stable package to Readme and Changelog --- 1.5.md | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/1.5.md b/1.5.md index 16eb2544..247dffee 100644 --- a/1.5.md +++ b/1.5.md @@ -10,6 +10,7 @@ - Neofetch is now packaged for `Fedora` and `Fedora` based distros. Thanks **[@konimex](https://github.com/konimex)**. - Added installation instructions for RHEL and CentOS. Thanks **[@konimex](https://github.com/konimex)**. +- Added stable package to the AUR. **[neofetch](https://aur.archlinux.org/packages/neofetch/)** ### Info diff --git a/README.md b/README.md index 96445b95..8d846de6 100644 --- a/README.md +++ b/README.md @@ -133,7 +133,7 @@ https://github.com/dylanaraps/neofetch/wiki/Following-HEAD ### Arch -1. Install **[neofetch-git](https://aur.archlinux.org/packages/neofetch-git/)** from the aur. +1. Install **[neofetch](https://aur.archlinux.org/packages/neofetch/)** or **[neofetch-git](https://aur.archlinux.org/packages/neofetch-git/)** from the aur. ### Gentoo / Funtoo From 1616bf13418bf575b54d7b819bc5609c3909e23b Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 18:16:22 +1100 Subject: [PATCH 70/76] itunes support added --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 1ff3eead..90debdc0 100755 --- a/neofetch +++ b/neofetch @@ -1139,6 +1139,10 @@ getsong () { song=${song//'['*} ;; esac + elif [ -n "$(ps aux | awk '!(/awk/ || /Helper/) && /iTunes/')" ]; then + song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " name of current track as string')" + state="$(osascript -e 'tell application "iTunes" to player state as string')" + else song="Unknown" fi From be2831dc5a139075ad2d5fa91411c001067f3381 Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 18:48:01 +1100 Subject: [PATCH 71/76] spotify support added --- neofetch | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neofetch b/neofetch index 90debdc0..d30c8f11 100755 --- a/neofetch +++ b/neofetch @@ -1143,6 +1143,10 @@ getsong () { song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " name of current track as string')" state="$(osascript -e 'tell application "iTunes" to player state as string')" + elif [ -n "$(ps aux | awk '!(/awk/) && /spotify/')" ]; then + song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" + state="$(osascript -e 'tell application "Spotify" to player state')" + else song="Unknown" fi From f105207d01b011f16bb83d1b3e806e1839b0a37a Mon Sep 17 00:00:00 2001 From: Andrew Titmuss Date: Sat, 12 Mar 2016 18:53:55 +1100 Subject: [PATCH 72/76] fixed output for spotify --- neofetch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch b/neofetch index d30c8f11..bd502fe2 100755 --- a/neofetch +++ b/neofetch @@ -1145,7 +1145,7 @@ getsong () { elif [ -n "$(ps aux | awk '!(/awk/) && /spotify/')" ]; then song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" - state="$(osascript -e 'tell application "Spotify" to player state')" + state="$(osascript -e 'tell application "Spotify" to player state as string')" else song="Unknown" From 04d74d8102a446594f70c07d1dd8ffb969ead457 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 12 Mar 2016 18:57:34 +1100 Subject: [PATCH 73/76] Changelog --- 1.5.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/1.5.md b/1.5.md index 247dffee..ce12f7a0 100644 --- a/1.5.md +++ b/1.5.md @@ -19,7 +19,7 @@ **CPU**
- Add `cpu_shorthand` to shorten the output of CPU. Thanks **[@iandrewt](https://github.com/iandrewt)** -- Takes these values: `name`, `speed`, `tiny`, `on`, `off` + - Takes these values: `name`, `speed`, `tiny`, `on`, `off` **GPU**
- Added new `tiny` option to `gpu_shorthand` to further shorten the GPU output. Thanks **[@iandrewt](https://github.com/iandrewt)** @@ -27,6 +27,10 @@ **Birthday**
- Fixed the birthday function on OS X, it apparently wasn't working from the start. Thanks **[@iandrewt](https://github.com/iandrewt)** +**Song**
+- [ OSX ] Added Spotify support to song. Thanks **[@iandrewt](https://github.com/iandrewt)** +- [ OSX ] Added Itunes support to song. Thanks **[@iandrewt](https://github.com/iandrewt)** + ### Ascii - Kaos: Update ascii logo to the new logo. From edd87f4cfec2c05701415d13b2e8739ed48008f1 Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 12 Mar 2016 19:11:17 +1100 Subject: [PATCH 74/76] Fix bug where i3 would show up as a desktop environment and a window manager --- neofetch | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 6ef8714f..ac6079d6 100755 --- a/neofetch +++ b/neofetch @@ -27,6 +27,7 @@ SYS_LOCALE="$LANG" export LC_ALL=C export LANG=C + # Config Options {{{ @@ -727,7 +728,7 @@ getshell () { # Desktop Environment {{{ getde () { - [ "$XDG_CURRENT_DESKTOP" ] && de="$XDG_CURRENT_DESKTOP" + [ "$XDG_CURRENT_DESKTOP" != "i3" ] && de="$XDG_CURRENT_DESKTOP" } # }}} @@ -1142,7 +1143,7 @@ getsong () { elif [ -n "$(ps aux | awk '!(/awk/ || /Helper/) && /iTunes/')" ]; then song="$(osascript -e 'tell application "iTunes" to artist of current track as string & " - " name of current track as string')" state="$(osascript -e 'tell application "iTunes" to player state as string')" - + elif [ -n "$(ps aux | awk '!(/awk/) && /spotify/')" ]; then song="$(osascript -e 'tell application "Spotify" to artist of current track as string & " - " & name of current track as string')" state="$(osascript -e 'tell application "Spotify" to player state as string')" From 12a634af0e5d043cb1eebc3353069a55e34017bc Mon Sep 17 00:00:00 2001 From: Dylan Date: Sat, 12 Mar 2016 19:12:10 +1100 Subject: [PATCH 75/76] Changelog --- 1.5.md | 1 + 1 file changed, 1 insertion(+) diff --git a/1.5.md b/1.5.md index ce12f7a0..77453257 100644 --- a/1.5.md +++ b/1.5.md @@ -1,6 +1,7 @@ # Neofetch 1.5 - Changed default gap size to `2`. +- Fixed bug where `i3` would show up as both a DE and a WM. ### OS From 3a0595665c63292c3a7a82eb10dd618b4f2ff84d Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 12 Mar 2016 15:12:57 +0700 Subject: [PATCH 76/76] Don't forget to update the version in manpage --- neofetch.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/neofetch.1 b/neofetch.1 index ffa0aca9..d1693d49 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -1,4 +1,4 @@ -.TH NEOFETCH "1" "March 2016" "1.4444" "User Commands" +.TH NEOFETCH "1" "March 2016" "1.5" "User Commands" .SH NAME neofetch \- simple system information script