From 3d6c03e4eaff6499df980de154ba220f0312a899 Mon Sep 17 00:00:00 2001 From: Nicolas Vigier Date: Wed, 23 Mar 2011 21:39:44 +0000 Subject: check if the list of .pc files is not null before running pkg-config on it --- pkgconfigdeps.sh | 34 ++++++++++++++++++++-------------- 1 file changed, 20 insertions(+), 14 deletions(-) (limited to 'pkgconfigdeps.sh') diff --git a/pkgconfigdeps.sh b/pkgconfigdeps.sh index e7dba2c..74fcdd9 100755 --- a/pkgconfigdeps.sh +++ b/pkgconfigdeps.sh @@ -22,15 +22,18 @@ case $1 in ;; esac done - # Query the dependencies of the package. - PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-errors --print-provides $pcfiles | while read n r v ; do - # We have a dependency. Make a note that we need the pkgconfig - # tool for this package. - test -z "$v" && test -n "$r" && echo "Error with pkgconfig($n)" >&2 && exit 1 - echo "pkgconfig($n)" "$r" "$v" - done - test ${PIPESTATUS[0]} -ne 0 && echo "$pkgconfig returned an error" >&2 && exit 1 - # The dependency on the pkgconfig package itself. + if [ -n "$pcfile" ] + then + # Query the dependencies of the package. + PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-errors --print-provides $pcfiles | while read n r v ; do + # We have a dependency. Make a note that we need the pkgconfig + # tool for this package. + test -z "$v" && test -n "$r" && echo "Error with pkgconfig($n)" >&2 && exit 1 + echo "pkgconfig($n)" "$r" "$v" + done + test ${PIPESTATUS[0]} -ne 0 && echo "$pkgconfig returned an error" >&2 && exit 1 + # The dependency on the pkgconfig package itself. + fi ;; -R|--requires) while read filename ; do @@ -40,11 +43,14 @@ case $1 in PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$(dirname ${filename}) esac done - PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-errors --print-requires ${pcfiles} | while read n r v ; do - test -z "$v" && test -n "$r" && echo "Error with pkgconfig($n)" >&2 && exit 1 - echo "pkgconfig($n)" "$r" "$v" - done - test ${PIPESTATUS[0]} -ne 0 && echo "$pkgconfig returned an error" >&2 && exit 1 + if [ -n "$pcfile" ] + then + PKG_CONFIG_PATH=$PKG_CONFIG_PATH $pkgconfig --print-errors --print-requires ${pcfiles} | while read n r v ; do + test -z "$v" && test -n "$r" && echo "Error with pkgconfig($n)" >&2 && exit 1 + echo "pkgconfig($n)" "$r" "$v" + done + test ${PIPESTATUS[0]} -ne 0 && echo "$pkgconfig returned an error" >&2 && exit 1 + fi ;; esac exit 0 -- cgit v1.2.1