From b6a55cf91db98985d1586f6a2a9c63bfd3184be9 Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Sun, 15 Jan 2017 09:18:17 +1100 Subject: [PATCH] Config: Remove 'w3m_img_path' --- config/config | 16 ---------------- neofetch | 8 ++++---- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/config/config b/config/config index 3969b332..305c8cb6 100644 --- a/config/config +++ b/config/config @@ -705,22 +705,6 @@ image_host="teknik" # Config Options -# w3m-img path -# Only works with the w3m backend. -# -# NOTE: Only change this if "neofetch -v" says that it "couldn't find w3m-img". -# Neofetch has a function that automatically finds w3m-img for you. It looks -# in the following directories: -# /usr/lib/w3m/w3mimgdisplay -# /usr/libexec/w3m/w3mimgdisplay -# /usr/lib64/w3m/w3mimgdisplay -# /usr/libexec64/w3m/w3mimgdisplay -# If w3m-img is installed elsewhere on your system, open an issue on the repo -# and I'll add it to the function inside the script. If w3m-img is installed -# in a non-standard way (in your home folder, etc) then change the variable -# below to the custom location. Otherwise, don't touch this. -w3m_img_path="/usr/lib/w3m/w3mimgdisplay" - # Enable/Disable config file # # Default: 'on' diff --git a/neofetch b/neofetch index c19ee6ca..ec2ecf60 100755 --- a/neofetch +++ b/neofetch @@ -2133,10 +2133,7 @@ get_wallpaper() { get_w3m_img_path() { # Find w3m-img path. - if [[ -x "$w3m_img_path" ]]; then - w3m_img_path="$w3m_img_path" - - elif [[ -x "/usr/lib/w3m/w3mimgdisplay" ]]; then + if [[ -x "/usr/lib/w3m/w3mimgdisplay" ]]; then w3m_img_path="/usr/lib/w3m/w3mimgdisplay" elif [[ -x "/usr/libexec/w3m/w3mimgdisplay" ]]; then @@ -2147,6 +2144,9 @@ get_w3m_img_path() { elif [[ -x "/usr/libexec64/w3m/w3mimgdisplay" ]]; then w3m_img_path="/usr/libexec64/w3m/w3mimgdisplay" + + else + err "Image: w3m-img wasn't found on your system" fi }