From 0ea04cc99f38f5511d5677b7507198ce74012b92 Mon Sep 17 00:00:00 2001 From: Muhammad Herdiansyah Date: Sat, 14 Jan 2017 13:58:34 +0700 Subject: [PATCH 1/3] Model: Strip out more OEM info Source: https://redd.it/5nvb8z/ --- neofetch | 1 + 1 file changed, 1 insertion(+) diff --git a/neofetch b/neofetch index 0ff17521..0368ee1a 100755 --- a/neofetch +++ b/neofetch @@ -294,6 +294,7 @@ get_model() { model="${model//Undefined}" model="${model//Default string}" model="${model//Not Specified}" + model="${model//Type1ProductConfigId}" } get_title() { From 2849dc2e4434f6b99a4fbabe32172b0dd40436ab Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Jan 2017 12:13:10 +1100 Subject: [PATCH 2/3] Docs: Remove inconsistencies --- neofetch | 16 ++++++++-------- neofetch.1 | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/neofetch b/neofetch index 0368ee1a..005a9058 100755 --- a/neofetch +++ b/neofetch @@ -3631,7 +3631,7 @@ INFO: --cpu_shorthand type Shorten the output of CPU Possible values: name, speed, tiny, on, off --cpu_cores type Whether or not to display the number of CPU cores - Takes: logical, physical, off + Possible values: logical, physical, off NOTE: 'physical' doesn't work on BSD. @@ -3664,7 +3664,7 @@ INFO: --shell_path on/off Enable/Disable showing \$SHELL path --shell_version on/off Enable/Disable showing \$SHELL version --disk_show value Which disks to display. - Takes: '/', '/dev/sdXX', '/path/to/mount point' + Possible values: '/', '/dev/sdXX', '/path/to/mount point' NOTE: Multiple values can be given. (--disk_show '/' '/dev/sdc1') @@ -3701,13 +3701,13 @@ BARS: --bar_colors num num Colors to make the bar. Set in this order: elapsed, total --cpu_display mode Bar mode. - Takes: bar, infobar, barinfo, off + Possible values: bar, infobar, barinfo, off --memory_display mode Bar mode. - Takes: bar, infobar, barinfo, off + Possible values: bar, infobar, barinfo, off --battery_display mode Bar mode. - Takes: bar, infobar, barinfo, off + Possible values: bar, infobar, barinfo, off --disk_display mode Bar mode. - Takes: bar, infobar, barinfo, off + Possible values: bar, infobar, barinfo, off IMAGE: --image type Image source. Where and what image we display. Possible values: wall, ascii, @@ -3715,7 +3715,7 @@ IMAGE: --size 00px | --size 00% How to size the image. Possible values: auto, 00px, 00%, none --crop_mode mode Which crop mode to use - Takes the values: normal, fit, fill + Possible values: normal, fit, fill --crop_offset value Change the crop offset for normal mode. Possible values: northwest, north, northeast, west, center, east, southwest, south, southeast @@ -3757,7 +3757,7 @@ SCREENSHOT: -s, --scrot /path/to/img Take a screenshot, if path is left empty the screen- shot function will use \$scrot_dir and \$scrot_name. -su, --upload /path/to/img Same as --scrot but uploads the scrot to a website. - --image_host Website to upload scrots to. Takes: imgur, teknik + --image_host imgur/teknik Website to upload scrots to. --scrot_cmd cmd Screenshot program to launch OTHER: diff --git a/neofetch.1 b/neofetch.1 index f6d6468e..9188c54a 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -36,7 +36,7 @@ Possible values: name, speed, tiny, on, off .TP \fB\-\-cpu_cores\fR type Whether or not to display the number of CPU cores -Takes: logical, physical, off +Possible values: logical, physical, off .IP NOTE: 'physical' doesn't work on BSD. .TP @@ -92,7 +92,7 @@ Enable/Disable showing $SHELL version .TP \fB\-\-disk_show\fR value Which disks to display. -Takes: '/', '/dev/sdXX', '/path/to/mount point' +Possible values: '/', '/dev/sdXX', '/path/to/mount point' .IP NOTE: Multiple values can be given. (\fB\-\-disk_show\fR '/' '/dev/sdc1') .TP @@ -158,19 +158,19 @@ Set in this order: elapsed, total .TP \fB\-\-cpu_display\fR mode Bar mode. -Takes: bar, infobar, barinfo, off +Possible values: bar, infobar, barinfo, off .TP \fB\-\-memory_display\fR mode Bar mode. -Takes: bar, infobar, barinfo, off +Possible values: bar, infobar, barinfo, off .TP \fB\-\-battery_display\fR mode Bar mode. -Takes: bar, infobar, barinfo, off +Possible values: bar, infobar, barinfo, off .TP \fB\-\-disk_display\fR mode Bar mode. -Takes: bar, infobar, barinfo, off +Possible values: bar, infobar, barinfo, off .SS "IMAGE:" .TP \fB\-\-image\fR type @@ -184,7 +184,7 @@ Possible values: auto, 00px, 00%, none .TP \fB\-\-crop_mode\fR mode Which crop mode to use -Takes the values: normal, fit, fill +Possible values: normal, fit, fill .TP \fB\-\-crop_offset\fR value Change the crop offset for normal mode. @@ -247,8 +247,8 @@ Take a screenshot, if path is left empty the screenshot function will use $scrot \fB\-su\fR, \fB\-\-upload\fR \fI\,/path/to/img\/\fP Same as \fB\-\-scrot\fR but uploads the scrot to a website. .TP -\fB\-\-image_host\fR -Website to upload scrots to. Takes: imgur, teknik +\fB\-\-image_host\fR imgur/teknik +Website to upload scrots to. .TP \fB\-\-scrot_cmd\fR cmd Screenshot program to launch From f72234234ddbdfcc50eff2ce802534422d9acd2c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Jan 2017 12:16:33 +1100 Subject: [PATCH 3/3] Config: Add config_version to aid in adding backwards compatibility in the future --- config/config | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/config/config b/config/config index 7fe75e6d..6d8e6a9d 100644 --- a/config/config +++ b/config/config @@ -739,3 +739,9 @@ config="on" # as a default config and NOT as a user config. Changing this in # your user config won't actually do anything. config_file="${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config" + +# Config version. +# +# NOTE: Don't change this value, neofetch reads this to determine +# how to handle backwards compatibility. +config_version="2.1.0"