summaryrefslogtreecommitdiff
path: root/autodeps
diff options
context:
space:
mode:
authorVille Skyttä <ville.skytta@iki.fi>2009-12-16 23:14:04 +0200
committerPanu Matilainen <pmatilai@redhat.com>2009-12-17 10:43:52 +0200
commit79b0ebedc13185f2d85e688d8cd4e007ddea70e1 (patch)
tree5ff4ae70723fe35fd86f4316b40a74497f07bd15 /autodeps
parentedac0476a8ea3fbd1d86df2667a1b62d831b2653 (diff)
downloadrpm-79b0ebedc13185f2d85e688d8cd4e007ddea70e1.tar.gz
rpm-79b0ebedc13185f2d85e688d8cd4e007ddea70e1.tar.bz2
rpm-79b0ebedc13185f2d85e688d8cd4e007ddea70e1.zip
Use grep -E and grep -F instead of egrep and fgrep.
egrep and fgrep are deprecated in GNU grep and "historical" in POSIX.
Diffstat (limited to 'autodeps')
-rw-r--r--autodeps/aix.prov2
-rw-r--r--autodeps/aix4.prov2
-rw-r--r--autodeps/aix4.req2
-rw-r--r--autodeps/darwin.req4
-rw-r--r--autodeps/freebsd.req4
-rw-r--r--autodeps/freebsdelf.req2
-rw-r--r--autodeps/hpux.req2
-rw-r--r--autodeps/irix6.prov2
-rw-r--r--autodeps/irix6.req2
-rw-r--r--autodeps/linux.req4
-rw-r--r--autodeps/openbsd.req4
-rw-r--r--autodeps/osf.prov2
-rw-r--r--autodeps/solaris.req2
13 files changed, 17 insertions, 17 deletions
diff --git a/autodeps/aix.prov b/autodeps/aix.prov
index 2fab0d0ab..6f7c8bd52 100644
--- a/autodeps/aix.prov
+++ b/autodeps/aix.prov
@@ -59,7 +59,7 @@ find_prov_power()
# Use the verbose version of dump to find the sharable objects
while read f
do
- LANG=C /usr/bin/dump -ov $f/ 2>/dev/null | egrep "^Flags.*SHROBJ|:$" |
+ LANG=C /usr/bin/dump -ov $f/ 2>/dev/null | grep -E "^Flags.*SHROBJ|:$" |
awk 'match($1,":$") { member=$1 }
!match($1,":$") {print member} '
done | sed -e 's/:$//' -e 's/\/\[/\(/g' -e 's/\]/)/g' | xargs -i basename {} |
diff --git a/autodeps/aix4.prov b/autodeps/aix4.prov
index a7aa5fd54..59637a76f 100644
--- a/autodeps/aix4.prov
+++ b/autodeps/aix4.prov
@@ -107,7 +107,7 @@ export LANG
# out.
#
filelist=`sed "s/['\"]/\\\&/g" | xargs file \
- | egrep 'archive|executable|symbolic link' | cut -d: -f1`
+ | grep -E 'archive|executable|symbolic link' | cut -d: -f1`
for f in $filelist
do
diff --git a/autodeps/aix4.req b/autodeps/aix4.req
index 84fb49928..79e988b88 100644
--- a/autodeps/aix4.req
+++ b/autodeps/aix4.req
@@ -45,7 +45,7 @@ LANG=C
export LANG
filelist=`sed "s/['\"]/\\\&/g" | xargs file \
- | egrep '^.*:.*(executable |archive )' | cut -d: -f1`
+ | grep -E '^.*:.*(executable |archive )' | cut -d: -f1`
for f in $filelist
do
diff --git a/autodeps/darwin.req b/autodeps/darwin.req
index 9bb08b753..e571710d8 100644
--- a/autodeps/darwin.req
+++ b/autodeps/darwin.req
@@ -5,8 +5,8 @@
ulimit -c 0
filelist=`sed "s/['\"]/\\\&/g"`
-exelist=`echo $filelist | xargs file | fgrep Mach-O | cut -d: -f1 `
-scriptlist=`echo $filelist | xargs file | egrep ":.* (commands|script) " | cut -d: -f1 `
+exelist=`echo $filelist | xargs file | grep -F Mach-O | cut -d: -f1 `
+scriptlist=`echo $filelist | xargs file | grep -E ":.* (commands|script) " | cut -d: -f1 `
for f in $exelist; do
if [ -x $f ]; then
diff --git a/autodeps/freebsd.req b/autodeps/freebsd.req
index c42d93c5a..9a1e0f4aa 100644
--- a/autodeps/freebsd.req
+++ b/autodeps/freebsd.req
@@ -6,8 +6,8 @@
ulimit -c 0
filelist=`sed "s/['\"]/\\\&/g"`
-exelist=`echo $filelist | xargs file | fgrep executable | cut -d: -f1 `
-scriptlist=`echo $filelist | xargs file | egrep ":.* (commands|script) " | cut -d: -f1 `
+exelist=`echo $filelist | xargs file | grep -F executable | cut -d: -f1 `
+scriptlist=`echo $filelist | xargs file | grep -E ":.* (commands|script) " | cut -d: -f1 `
for f in $exelist; do
if [ -x $f ]; then
diff --git a/autodeps/freebsdelf.req b/autodeps/freebsdelf.req
index 056d9d9be..dde04c599 100644
--- a/autodeps/freebsdelf.req
+++ b/autodeps/freebsdelf.req
@@ -7,7 +7,7 @@ ulimit -c 0
filelist=`sed "s/['\"]/\\\&/g"`
exelist=`if test "x$filelist" != x; then echo $filelist | xargs file | grep ":.*executable" | cut -d: -f1; fi`
-scriptlist=`if test "x$filelist" != x; then echo $filelist | xargs file | egrep ":.* (commands|script) " | cut -d: -f1; fi`
+scriptlist=`if test "x$filelist" != x; then echo $filelist | xargs file | grep -E ":.* (commands|script) " | cut -d: -f1; fi`
liblist=`if test "x$filelist" != x; then echo $filelist | xargs file | grep ":.*shared object" | cut -d : -f1; fi`
LDDLIST=`for f in $exelist; do
diff --git a/autodeps/hpux.req b/autodeps/hpux.req
index dd8984f2d..ab7290008 100644
--- a/autodeps/hpux.req
+++ b/autodeps/hpux.req
@@ -84,7 +84,7 @@ do
#
# Is it a shared library?
#
- maybe_shared_lib=`echo "$file_output" | egrep '(executable|library)'`
+ maybe_shared_lib=`echo "$file_output" | grep -E '(executable|library)'`
if test X"$maybe_shared_lib" != X ; then
chatr $f 2>/dev/null \
| awk '
diff --git a/autodeps/irix6.prov b/autodeps/irix6.prov
index 8fb61f23b..87ee4e1a1 100644
--- a/autodeps/irix6.prov
+++ b/autodeps/irix6.prov
@@ -84,7 +84,7 @@ do
#
# If it's a shared library, run elfdump on it.
#
- maybe_shared_lib=`file $f | egrep 'ELF.*dynamic lib'`
+ maybe_shared_lib=`file $f | grep -E 'ELF.*dynamic lib'`
if test X"$maybe_shared_lib" != X ; then
elfdump -L $f 2>/dev/null | awk '
diff --git a/autodeps/irix6.req b/autodeps/irix6.req
index 396cd78c2..72442acf0 100644
--- a/autodeps/irix6.req
+++ b/autodeps/irix6.req
@@ -99,7 +99,7 @@ do
#
# It might be a shared library.
#
- maybe_shared_lib=`echo "$file_output" | egrep 'executable|lib'`
+ maybe_shared_lib=`echo "$file_output" | grep -E 'executable|lib'`
if test X"$maybe_shared_lib" != X ; then
elfdump -Dl $f 2>/dev/null \
diff --git a/autodeps/linux.req b/autodeps/linux.req
index 30e2e5b1c..cf60bd9ac 100644
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -20,10 +20,10 @@ fi
# --- Grab the file manifest and classify files.
#filelist=`sed "s/['\"]/\\\&/g"`
filelist=`sed "s/[]['\"*?{}]/\\\\\&/g"`
-exelist=`echo $filelist | xargs -r file | egrep -v ":.* (commands|script) " | \
+exelist=`echo $filelist | xargs -r file | grep -Ev ":.* (commands|script) " | \
grep ":.*executable" | cut -d: -f1`
scriptlist=`echo $filelist | xargs -r file | \
- egrep ":.* (commands|script) " | cut -d: -f1`
+ grep -E ":.* (commands|script) " | cut -d: -f1`
liblist=`echo $filelist | xargs -r file | \
grep ":.*shared object" | cut -d : -f1`
diff --git a/autodeps/openbsd.req b/autodeps/openbsd.req
index 551ac2cfb..ec3bac728 100644
--- a/autodeps/openbsd.req
+++ b/autodeps/openbsd.req
@@ -6,8 +6,8 @@
ulimit -c 0
filelist=`sed "s/['\"]/\\\&/g"`
-exelist=`echo $filelist | xargs file | fgrep executable | cut -d: -f1 `
-scriptlist=`echo $filelist | xargs file | egrep ":.* (commands|script) " | cut -d: -f1 `
+exelist=`echo $filelist | xargs file | grep -F executable | cut -d: -f1 `
+scriptlist=`echo $filelist | xargs file | grep -E ":.* (commands|script) " | cut -d: -f1 `
for f in $exelist; do
if [ -x $f ]; then
diff --git a/autodeps/osf.prov b/autodeps/osf.prov
index 3d7c57b6b..6b5413364 100644
--- a/autodeps/osf.prov
+++ b/autodeps/osf.prov
@@ -79,7 +79,7 @@ do
#
# if it's a shared library, run odump on it.
#
- maybe_shared_lib=`file $f | egrep 'COFF.*shared library'`
+ maybe_shared_lib=`file $f | grep -E 'COFF.*shared library'`
if test X"$maybe_shared_lib" != X ; then
odump -D $f 2>/dev/null | awk '
diff --git a/autodeps/solaris.req b/autodeps/solaris.req
index d0f7f8928..05e40247c 100644
--- a/autodeps/solaris.req
+++ b/autodeps/solaris.req
@@ -10,7 +10,7 @@ ulimit -c 0
filelist=`sed "s/['\"]/\\\&/g"`
[ -z "$filelist" ] && exit #emulate -r option for xargs
-for f in `echo $filelist | xargs file | fgrep executable | cut -d: -f1`; do
+for f in `echo $filelist | xargs file | grep -F executable | cut -d: -f1`; do
ldd $f 2>/dev/null | awk '/\=\>/ { print $1 }'
done | sort -u | sed "s/['\"]/\\\&/g" | xargs -n 1 basename | sort -u