diff options
| -rw-r--r-- | CHANGES | 1 | ||||
| -rw-r--r-- | po/rpm.pot | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 5 | ||||
| -rw-r--r-- | scripts/Makefile.in | 4 | ||||
| -rwxr-xr-x | scripts/check-prereqs | 17 |
5 files changed, 23 insertions, 6 deletions
@@ -9,6 +9,7 @@ - use directory tokens internally to reduce memory usage. - permit --whatprovides to lookup file dependencies. - fail to package if absolute symlink points within build root. + - initial version of check-prereqs. 3.0.2 -> 3.0.3 - add --eval to find result of macro expansion. diff --git a/po/rpm.pot b/po/rpm.pot index 6be91a13f..8067f7dfb 100644 --- a/po/rpm.pot +++ b/po/rpm.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-12-02 11:53-0500\n" +"POT-Creation-Date: 1999-12-02 13:26-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" diff --git a/scripts/Makefile.am b/scripts/Makefile.am index d5b320acc..50d020120 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign EXTRA_DIST = \ - convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl \ + check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl \ freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req \ perl.prov perl.req rpmdiff u_pkg.sh vpkg-provides.sh vpkg-provides2.sh @@ -13,7 +13,6 @@ all: configdir = ${prefix}/lib/rpm config_SCRIPTS = \ - convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl \ + check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl \ freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req \ perl.prov perl.req rpmdiff u_pkg.sh vpkg-provides.sh vpkg-provides2.sh - diff --git a/scripts/Makefile.in b/scripts/Makefile.in index a1c6b912c..59657c2d8 100644 --- a/scripts/Makefile.in +++ b/scripts/Makefile.in @@ -152,13 +152,13 @@ varprefix = @varprefix@ AUTOMAKE_OPTIONS = 1.4 foreign -EXTRA_DIST = convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff u_pkg.sh vpkg-provides.sh vpkg-provides2.sh +EXTRA_DIST = check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff u_pkg.sh vpkg-provides.sh vpkg-provides2.sh installprefix = $(DESTDIR) configdir = ${prefix}/lib/rpm -config_SCRIPTS = convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff u_pkg.sh vpkg-provides.sh vpkg-provides2.sh +config_SCRIPTS = check-prereqs convertrpmrc.sh find-lang.sh find-prov.pl find-req.pl freshen.sh get_magic.pl getpo.sh http.req magic.prov magic.req perl.prov perl.req rpmdiff u_pkg.sh vpkg-provides.sh vpkg-provides2.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h diff --git a/scripts/check-prereqs b/scripts/check-prereqs new file mode 100755 index 000000000..2b96453ca --- /dev/null +++ b/scripts/check-prereqs @@ -0,0 +1,17 @@ +#!/bin/bash2 + +bashit="/bin/bash2 --rpm-requires" + +# Make sure that this bash has the rpm-requires hack +$bashit < /dev/null 2>&1 > /dev/null || exit $? + +prereqs="`cat | $bashit | sort | uniq | sed -e 's/^bash(//' -e 's/)$//'`" +[ -z "$prereqs" ] && exit 0 + +for prereq in $prereqs +do + case $prereq in + /*) echo $prereq ;; + *) echo "`which $prereq`" ;; + esac +done | sort | uniq |