Fix a quoting issue in lesspipe.sh-r2 and add a trap to prevent 'Broken pipe' messages. Thanks to Glen in bug 38854

5 files changed, 13 insertions, 6 deletions

diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index 4f14ae69a40f..2928500e69e3 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/less
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.26 2004/06/15 20:01:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/ChangeLog,v 1.27 2004/06/17 00:03:17 agriffis Exp $
+
+  16 Jun 2004; Aron Griffis <agriffis@gentoo.org> files/lesspipe.sh-r2,
+  -less-382-r1.ebuild:
+  Fix a quoting issue in lesspipe.sh-r2 and add a trap to prevent 'Broken pipe'
+  messages. Thanks to Glen in bug 38854
 
 *less-382-r1 (15 Jun 2004)
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index a8dba2f6f59b..39c6c2bf754c 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,18 +1,18 @@
 MD5 1002907002ece42cfc52e252d7ed0ce3 less-378-r2.ebuild 939
-MD5 77b89ddbe077351773afe3a987f04ff9 less-382-r1.ebuild 810
 MD5 e6d5966f229edc8d976bf789f0e3ec65 less-381.ebuild 946
 MD5 3f6384ca55e16e3f4456f198ae47fa25 less-378-r1.ebuild 940
 MD5 aa92c0ed90060e5a61a6fb79e5176b4f less-376.ebuild 809
+MD5 77b89ddbe077351773afe3a987f04ff9 less-382-r2.ebuild 810
 MD5 b4d2b765738a3026570e5ec10fcdd546 less-382.ebuild 800
 MD5 03f942f19f697f247fb3fde755d1f8e0 less-378.ebuild 814
 MD5 d1a9c736988d85480b1a69760753d313 ChangeLog 3614
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 0cc555c44c02b9b457e98ed39a63f1a2 files/lesspipe.sh-r1 1429
-MD5 e8ae2314e639439ffc73bbd6c0dff09e files/lesspipe.sh-r2 1270
+MD5 b8fb86a866cd77b7fa51a24055b4bc1b files/lesspipe.sh-r2 1292
 MD5 24c3d68ec84e1fcd23ef6d95b0105a76 files/lesspipe.sh 1429
 MD5 8769c7864189f8c6f30907d60f350789 files/digest-less-378-r1 246
 MD5 f60badb5a4f71f62a360a728d0757ecd files/digest-less-378-r2 246
-MD5 6f05cb473c8bd03fb8fb5ba7466aa804 files/digest-less-382-r1 60
+MD5 6f05cb473c8bd03fb8fb5ba7466aa804 files/digest-less-382-r2 60
 MD5 7b5bdd5f20fe55f32420ed4b3203c6ff files/digest-less-376 243
 MD5 400d2d4b02a4fda6b5b177877dade4eb files/digest-less-378 243
 MD5 ddd20ba8447e21d2e3d3368833c7180e files/digest-less-381 60
diff --git a/sys-apps/less/files/digest-less-382-r1 b/sys-apps/less/files/digest-less-382-r2
index b6ee823b18a9..b6ee823b18a9 100644
--- a/sys-apps/less/files/digest-less-382-r1
+++ b/sys-apps/less/files/digest-less-382-r2
diff --git a/sys-apps/less/files/lesspipe.sh-r2 b/sys-apps/less/files/lesspipe.sh-r2
index af2e589164bf..1663589397b2 100644
--- a/sys-apps/less/files/lesspipe.sh-r2
+++ b/sys-apps/less/files/lesspipe.sh-r2
@@ -3,6 +3,8 @@
 # Preprocessor for 'less'. Used when this environment variable is set:
 # LESSOPEN="|lesspipe.sh %s"
 
+trap 'exit 0' PIPE
+
 F=$1	# so we can use "set" later to play with positional params
 
 case "$F" in
@@ -35,7 +37,7 @@ case "$F" in
   *)
 	set -- $(file -L "$F")
 	if [[ $2 == Linux/* || $3 == Linux/* || $2 == ELF || $3 == ELF ]]; then
-		strings $F
+		strings "$F"
 	fi
 	;;
 esac
diff --git a/sys-apps/less/less-382-r1.ebuild b/sys-apps/less/less-382-r2.ebuild
index 5d47e4c356ef..27b90279d1f2 100644
--- a/sys-apps/less/less-382-r1.ebuild
+++ b/sys-apps/less/less-382-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382-r1.ebuild,v 1.1 2004/06/15 20:01:47 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/less/less-382-r2.ebuild,v 1.1 2004/06/17 00:03:19 agriffis Exp $
 
 DESCRIPTION="Excellent text file viewer"
 HOMEPAGE="http://www.greenwoodsoftware.com/"