summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-18 21:42:53 +0000
committerDiego Elio Pettenò <flameeyes@gentoo.org>2006-12-18 21:42:53 +0000
commit014e514d63c84a67c0ed9599983581cd901fda01 (patch)
tree85c3da7f0547080e872aa18235090f0f1aaaf646 /patches/fbsd-conf/fbsd-conf.sh
parentAdd patch for configure LANG settings. (diff)
downloadautoepatch-014e514d63c84a67c0ed9599983581cd901fda01.tar.gz
autoepatch-014e514d63c84a67c0ed9599983581cd901fda01.tar.bz2
autoepatch-014e514d63c84a67c0ed9599983581cd901fda01.zip
Skip a find(1) execution, use fgrep to match a complete string, and make sure no false targets are outputted on empty commandline (can't use xargs's -r option as it's non-STANDARD).
svn path=/trunk/; revision=17
Diffstat (limited to 'patches/fbsd-conf/fbsd-conf.sh')
-rw-r--r--patches/fbsd-conf/fbsd-conf.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/fbsd-conf/fbsd-conf.sh b/patches/fbsd-conf/fbsd-conf.sh
index 31cbd02..54d727d 100644
--- a/patches/fbsd-conf/fbsd-conf.sh
+++ b/patches/fbsd-conf/fbsd-conf.sh
@@ -4,9 +4,9 @@
patch_targets() {
# Find the configure scripts with a libtool that checks for freebsd
# versioning format, and that were not patched with our patch already
- find "${WORKDIR}" -name configure -print0 | \
- xargs -0 grep --null -l "version_type=freebsd-" | \
- xargs -0 grep -L 'Handle Gentoo/FreeBSD as it was Linux'
+ fgrep --null -l --include configure "version_type=freebsd-" "${WORKDIR}" | \
+ xargs -0 fgrep -L 'Handle Gentoo/FreeBSD as it was Linux' | \
+ fgrep -v '(standard input)'
}
# This patch is required only on Gentoo/FreeBSD