From d7bf5da48e594a02c7b99a95ba24dc032a83e495 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 30 Mar 2016 10:20:06 +1100 Subject: [PATCH 1/2] Hardcode iterm2 mode to iterm2 --- neofetch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/neofetch b/neofetch index a2184044..ca0f1f99 100755 --- a/neofetch +++ b/neofetch @@ -2803,6 +2803,13 @@ if [ "$image" != "off" ]; then # Hide the cursor printf "\033[?25l" + # If iterm2 is detected use iterm2 backend. + if [ -n "$ITERM_PROFILE" ]; then + image_backend="iterm2" + else + image_backend="w3m" + fi + # Find w3mimgdisplay [ "$image_backend" == "w3m" ] && \ [ "$image" != "ascii" ] && \ From f62994a49cb22ee7749235802872e05b76e4a667 Mon Sep 17 00:00:00 2001 From: Dylan Date: Wed, 30 Mar 2016 10:22:29 +1100 Subject: [PATCH 2/2] Remove 'image_backend' as we now detect it automatically --- config/config | 5 ----- neofetch | 7 ------- neofetch.1 | 3 --- 3 files changed, 15 deletions(-) diff --git a/config/config b/config/config index ed283210..801a69f1 100644 --- a/config/config +++ b/config/config @@ -289,11 +289,6 @@ image="wall" # Thumbnail directory thumbnail_dir="$HOME/.cache/thumbnails/neofetch" -# Image Backend -# Which program to draw images with -# --image_backend w3m, iterm2 -image_backend="w3m" - # W3m-img path # Some systems have this in another location w3m_img_path="/usr/lib/w3m/w3mimgdisplay" diff --git a/neofetch b/neofetch index ca0f1f99..c40ddc4a 100755 --- a/neofetch +++ b/neofetch @@ -311,11 +311,6 @@ image="wall" # Thumbnail directory thumbnail_dir="$HOME/.cache/thumbnails/neofetch" -# Image Backend -# Which program to draw images with -# --image_backend w3m, iterm2 -image_backend="w3m" - # W3m-img path # Some systems have this in another location w3m_img_path="/usr/lib/w3m/w3mimgdisplay" @@ -2536,7 +2531,6 @@ usage () { cat << EOF Possible values: wall, ascii, /path/to/img, /path/to/dir/, off --size 20px | --size 20% Size to make the image, takes pixels or a percentage. - --image_backend w3m/iterm2 Which program to use to draw images. --image_position left/right Where to display the image: (Left/Right) --crop_mode mode Which crop mode to use Takes the values: normal, fit, fill @@ -2671,7 +2665,6 @@ while [ "$1" ]; do ;; --size) image_size="$2" ;; - --image_backend) image_backend="$2" ;; --image_position) image_position="$2" ;; --crop_mode) crop_mode="$2" ;; --crop_offset) crop_offset="$2" ;; diff --git a/neofetch.1 b/neofetch.1 index cc6379f8..e09e1d49 100644 --- a/neofetch.1 +++ b/neofetch.1 @@ -167,9 +167,6 @@ Possible values: wall, ascii, /path/to/img, /path/to/dir/, off .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 \--image_position 'left/right' Where to display the image: (Left/Right) .TP