SOURCES: bzip2-bzgrep.patch - use sed, bash not needed

sparky sparky at pld-linux.org
Fri Jun 16 21:23:18 CEST 2006


Author: sparky                       Date: Fri Jun 16 19:23:18 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use sed, bash not needed

---- Files affected:
SOURCES:
   bzip2-bzgrep.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/bzip2-bzgrep.patch
diff -u SOURCES/bzip2-bzgrep.patch:1.2 SOURCES/bzip2-bzgrep.patch:1.3
--- SOURCES/bzip2-bzgrep.patch:1.2	Wed Jun 14 12:38:03 2006
+++ SOURCES/bzip2-bzgrep.patch	Fri Jun 16 21:23:13 2006
@@ -1,19 +1,11 @@
 --- bzip2-1.0.2/bzgrep.flaw	2005-06-07 13:43:01.000000000 +0200
 +++ bzip2-1.0.2/bzgrep	2005-06-07 14:07:50.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- # Bzgrep wrapped for bzip2, 
- # adapted from zgrep by Philippe Troin <phil at fifi.org> for Debian GNU/Linux.
-@@ -63,7 +63,11 @@
+@@ -63,7 +63,9 @@
      bzip2 -cdfq "$i" | $grep $opt "$pat"
      r=$?
    else
 -    bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${i}:|"
-+    j=${i//\\\\/\\\\}
-+    j=${j//|/\\|}
-+    j=${j//&/\\&}
++    j="$(echo "$i" | sed 's/\\/\\\\/g; s/|/\\|/g; s/&/\\\&/g;' )"
 +    j=`printf "%s" "$j" | tr '\n' ' '`
 +    bzip2 -cdfq "$i" | $grep $opt "$pat" | sed "s|^|${j}:|"
      r=$?
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/bzip2-bzgrep.patch?r1=1.2&r2=1.3&f=u



More information about the pld-cvs-commit mailing list