summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/less/ChangeLog7
-rw-r--r--sys-apps/less/Manifest10
-rw-r--r--sys-apps/less/files/lesspipe.sh32
3 files changed, 28 insertions, 21 deletions
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index 0f0ae4536235..774132d71400 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-apps/less
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.94 2008/03/21 11:20:25 opfer Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.95 2009/02/02 19:44:13 vapier Exp $
+
+ 02 Feb 2009; Mike Frysinger <vapier@gentoo.org> files/lesspipe.sh:
+ Add support for .lz/.xz and unify more places with ${DECOMPRESSOR}.
21 Mar 2008; Christian Faulhammer <opfer@gentoo.org> less-416.ebuild,
less-418.ebuild:
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 4d3495891ffe..eb9ce01e39a1 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -4,16 +4,16 @@ Hash: SHA1
AUX README.Gentoo 823 RMD160 be59c37906fca17fa25f6781d3f5e7abc114dc57 SHA1 5a1f126af728f5220b97623050e2f9b1ea5ae58e SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d
AUX code2color.patch 1110 RMD160 712f7b79c94f92ee62825d5f53627f18fae693d2 SHA1 a82f937f3a923b52adc4f14cfc9b641903884839 SHA256 a3887126826ef0b4b821bd97cf4e7abfc8b1c9280bf2bb18a2a4cec9a2973936
AUX less.envd 50 RMD160 e9d7b2497aa81e13b740dc765c0fc87d4f1f2f8e SHA1 f903d459e7f0b2c14009304bebb7a045a7cccf9d SHA256 1f186ac4f500c842a9016702b3d7e9d69fe161db23cf56c316ed7f5a51da6a4e
-AUX lesspipe.sh 6996 RMD160 b2dd0ff09f5dace971131fb29acc45e8a1b75d6d SHA1 eb4b5f9afbc965590ba34ce0e8b4a3e5c423ba4b SHA256 9939cd86d630d5b4a7bba817213657c1d3d63fc79811d5a8a0fdbb60cbe70d06
+AUX lesspipe.sh 6954 RMD160 fc27c93e89a094db14e259731466ea6c8008c70e SHA1 a5265ddfe19a435280fba8092624d834f80eabd9 SHA256 df28ad048b5e46408ba82c6b67a8bd75e011ecb05953ab95e87aa03262728d15
DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d
DIST less-418.tar.gz 299213 RMD160 a10402aa423e3d3c4d950735208991d7d4afb85d SHA1 ec4fb48680878a7ac3499c46564c47c448b0aa22 SHA256 f532fcd61b012379d3258196a8588fd9d51ecdfb5c795485ab2f78d439b103b4
EBUILD less-418.ebuild 1180 RMD160 b5a7d6f84bdcc8a0453474a43026b2d4701ba0da SHA1 cd68135063018687e6f010c7a0a912e8b5dd8c62 SHA256 c90c40fe5c1b70d89fedae619c077f3e315b8e5fa4d772092d72bf09c8ffd026
-MISC ChangeLog 11303 RMD160 53326547020d882c9d030f5bd1dd875ef25ead17 SHA1 13e3f899581d02b0e859690e93c8491b53dd07b0 SHA256 8d691a226297c7fb907c64c78738d47e928bafe5a913cb9d57f5335f0217839d
+MISC ChangeLog 11444 RMD160 b9cf8299ff05f17b35571eeeab28632a3b996de6 SHA1 dc81de3112a6f40978d0f7bd87541dcf4693eae8 SHA256 6951363082e214c2e7f1095a5de9b1b7dee5b31d416ddf992af602fc7544c2db
MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.9 (GNU/Linux)
-iEYEARECAAYFAklVtxwACgkQn/5bYzqsSmGkNwCeMhUfovwD5ls6cYV/YG+78xnK
-p8IAoICS7YzNfxiKz448XvoWSjftEsZJ
-=dO11
+iEYEARECAAYFAkmHTRMACgkQn/5bYzqsSmFAeQCfeUZ8G+HWoYYgETgq/h7TKVDg
+/SwAoLCrFZog3UJhDGA9zXS6nrH2IaHd
+=YoFQ
-----END PGP SIGNATURE-----
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index a5ac7f6357fe..39122430f9d5 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -9,11 +9,12 @@ trap 'exit 0' PIPE
guesscompress() {
case "$1" in
- *.gz) echo "gunzip -c" ;;
- *.bz2) echo "bunzip2 -c" ;;
- *.lzma) echo "unlzma -c" ;;
- *.Z) echo "compress -d" ;;
- *) echo "cat" ;;
+ *.gz|*.z) echo "gunzip -c" ;;
+ *.bz2) echo "bunzip2 -c" ;;
+ *.lz) echo "lzip -c" ;;
+ *.lzma) echo "unlzma -c" ;;
+ *.xz) echo "xzdec" ;;
+ *) echo "cat" ;;
esac
}
@@ -99,15 +100,18 @@ lesspipe() {
;;
### Tar files ###
- *.tar) tar tvvf "$1" ;;
- *.tar.bz2|*.tbz2|*.tbz) tar tjvvf "$1" ;;
- *.tar.gz|*.tgz|*.tar.z) tar tzvvf "$1" ;;
- *.tar.lzma) lzma -dc -- "$1" | tar tvvf - ;;
+ *.tar|\
+ *.tar.bz2|*.tbz2|*.tbz|\
+ *.tar.gz|*.tgz|*.tar.z|\
+ *.tar.lz|*.tar.tlz|\
+ *.tar.lzma|*.tar.xz)
+ ${DECOMPRESSOR} -- "$1" | tar tvvf -;;
### Misc archives ###
- *.bz2) bzip2 -dc -- "$1" ;;
- *.gz|*.z) gzip -dc -- "$1" ;;
- *.lzma) lzma -dc -- "$1" ;;
+ *.bz2|\
+ *.gz|*.z|\
+ *.lz|\
+ *.lzma|*.xz) ${DECOMPRESSOR} -- "$1" ;;
*.rpm) rpm -qpivl --changelog -- "$1" ;;
*.cpi|*.cpio) cpio -itv < "$1" ;;
*.ace) unace l "$1" ;;
@@ -230,10 +234,10 @@ if [[ -z $1 ]] ; then
echo "Usage: lesspipe.sh <file>"
elif [[ $1 == "-V" || $1 == "--version" ]] ; then
Id="cvsid"
- cvsid="$Id: lesspipe.sh,v 1.31 2008/12/27 05:03:18 vapier Exp $"
+ cvsid="$Id: lesspipe.sh,v 1.32 2009/02/02 19:44:13 vapier Exp $"
cat <<-EOF
$cvsid
- Copyright 2001-2008 Gentoo Foundation
+ Copyright 2001-2009 Gentoo Foundation
Mike Frysinger <vapier@gentoo.org>
(with plenty of ideas stolen from other projects/distros)