From e00de5319de065027d47adfb0ee441b78c284302 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Jan 2017 21:53:21 +1100 Subject: [PATCH 1/3] Config: Remove unused options --- config/config | 23 ----------------------- 1 file changed, 23 deletions(-) diff --git a/config/config b/config/config index 6d8e6a9d..b96a6ce1 100644 --- a/config/config +++ b/config/config @@ -717,29 +717,6 @@ image_host="teknik" # Config Options -# Enable/Disable config file -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --config -# --config off, none -# -# Note: This option is only used when neofetch sources this config -# as a default config and NOT as a user config. Changing this in -# your user config won't actually do anything. -config="on" - -# Path to custom config file location -# -# Default: '${XDG_CONFIG_HOME:-${HOME}/.config}/neofetch/config' -# Values: '/path/to/config' -# Flag: --config_file -# -# Note: This option is only used when neofetch sources this config -# 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 From e25612f34eeb44f1ba4806893d5fd0739166895e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Jan 2017 21:53:55 +1100 Subject: [PATCH 2/3] Args: Remove unused options --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index 005a9058..bcf94bbc 100755 --- a/neofetch +++ b/neofetch @@ -3969,8 +3969,8 @@ get_args() { # Other "--config") case "$2" in - "none" | "off" | "") config="off" ;; - *) config_file="$2"; config="on"; get_user_config 2>/dev/null ;; + "none" | "off" | "") ;; + *) config_file="$2"; get_user_config 2>/dev/null ;; esac ;; "-v") verbose="on" ;; From 6666742550c0e573579b2d146697648cf346f686 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Jan 2017 21:54:36 +1100 Subject: [PATCH 3/3] Term Font: Remove conflicting variable names --- neofetch | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/neofetch b/neofetch index bcf94bbc..03858a50 100755 --- a/neofetch +++ b/neofetch @@ -1659,8 +1659,8 @@ get_term_font() { ;; "termite") - [[ -f "${XDG_CONFIG_HOME}/termite/config" ]] && config_file="${XDG_CONFIG_HOME}/termite/config" - term_font="$(awk -F '= ' '/\[options\]/ {opt=1} /^font/ {if(opt==1) a=$2; opt=0} END{print a}' "/etc/xdg/termite/config" "$config_file")" + [[ -f "${XDG_CONFIG_HOME}/termite/config" ]] && termite_config="${XDG_CONFIG_HOME}/termite/config" + term_font="$(awk -F '= ' '/\[options\]/ {opt=1} /^font/ {if(opt==1) a=$2; opt=0} END{print a}' "/etc/xdg/termite/config" "$termite_config")" ;; "urxvt" | "urxvtd" | "rxvt-unicode" | "xterm")