fix lesspipe setup for Gentoo

Also move it from zsh/env to shell/env.

diff --git a/shell/env b/shell/env
index e06969580eb62ee9865e2494f5ccf6c374580a68..2327cfef0a89df086ca1ae2f62890ff6c7825125 100644 (file)
--- 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 4a4a6e0e7a4335e24c3ad489420288891483786d..e5554e3dca3af1de5b5ae8ddd38d5bb959ea154b 100644 (file)
--- 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