From ae9b1f3d4fe45783c93439647753c1273e0a44b2 Mon Sep 17 00:00:00 2001 From: Simon Ruderich Date: Mon, 25 Aug 2014 03:04:11 +0200 Subject: [PATCH] fix lesspipe setup for Gentoo Also move it from zsh/env to shell/env. --- shell/env | 13 ++++++++++++- zsh/env | 7 ------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/shell/env b/shell/env index e069695..2327cfe 100644 --- a/shell/env +++ b/shell/env @@ -1,6 +1,6 @@ # Configuration file for environment related options for all shells. -# Copyright (C) 2011-2013 Simon Ruderich +# Copyright (C) 2011-2014 Simon Ruderich # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -122,4 +122,15 @@ LSCOLORS='ExgxxxxxBxxxxxBdBdExEb' # *--------------------- directory export LSCOLORS +# Setup lesspipe to view multiple file-types (like .gz, .zip, etc.) with less. +# Useful in combination with the "p" alias. Inspired by Debian's default bash +# files. Thanks. +if test -x /usr/bin/lesspipe; then + # Don't use eval $(lesspipe) which breaks on a few systems (e.g. Gentoo) + # due to a different lesspipe implementation. + LESSOPEN='| /usr/bin/lesspipe %s' + LESSCLOSE='/usr/bin/lesspipe %s %s' + export LESSOPEN LESSCLOSE +fi + # vim: ft=sh diff --git a/zsh/env b/zsh/env index 4a4a6e0..e5554e3 100644 --- a/zsh/env +++ b/zsh/env @@ -24,13 +24,6 @@ source_config ~/.shell/env # Make sure elements in PATH are unique. typeset -U path PATH -# Setup lesspipe to view multiple file-types (like .gz, .zip, etc.) with less. -# Useful in combination with the "p" alias. Taken from Debian's default bash -# files. Thanks. -if [[ -x /usr/bin/lesspipe ]]; then - eval $(SHELL=/bin/sh lesspipe) || echo 'Broken lesspipe!' >&2 -fi - source_config ~/.zsh/env.local -- 2.45.2