diff options
author | abs <abs> | 2001-07-05 21:00:54 +0000 |
---|---|---|
committer | abs <abs> | 2001-07-05 21:00:54 +0000 |
commit | 5b5f25314673d9556e48a665987aab86e5ff4f50 (patch) | |
tree | 63cf725d643b21090d827a3f6f38ba46a73c2923 /pkgtools/pkgchk/files/pkgchk.sh | |
parent | 59e76dbe5b00ccfa52e0a0de568adb1fc69ecf1e (diff) | |
download | pkgsrc-5b5f25314673d9556e48a665987aab86e5ff4f50.tar.gz |
Updated pkgchk to 1.02 - if extracting the pkgname form a pkgdir fails,
make sure to display the pkgdir name.
Diffstat (limited to 'pkgtools/pkgchk/files/pkgchk.sh')
-rwxr-xr-x | pkgtools/pkgchk/files/pkgchk.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh index 4f8bd5bf9f5..38889295884 100755 --- a/pkgtools/pkgchk/files/pkgchk.sh +++ b/pkgtools/pkgchk/files/pkgchk.sh @@ -1,6 +1,8 @@ #!/bin/sh -e # -# $Id: pkgchk.sh,v 1.2 2001/07/02 15:28:44 abs Exp $ +# $Id: pkgchk.sh,v 1.3 2001/07/05 21:00:54 abs Exp $ +# +# TODO: Handle and as well as or tags (eg: i386+x11) extract_variables() { @@ -181,14 +183,14 @@ fi # Check packages are installed # for pkgdir in $PKGDIRLIST ; do + cd $PKGSRCDIR/$pkgdir # Use 'make x' rather than 'make all' to avoid potential licence errors - pkgname=`printf 'x:\n\t@echo ${PKGNAME}\n'|make -f - -f Makefile x` + pkgname=`printf 'x:\n\t@echo ${PKGNAME}\n'|make -f - -f Makefile x` || true if [ -z "$pkgname" ]; then echo "Unable to extract PKGNAME for $pkgdir" exit 1 fi - if [ ! -d /var/db/pkg/$pkgname ];then echo -n "$pkgname: " pkg=`echo $pkgname | sed 's/-[0-9].*//'` @@ -212,7 +214,7 @@ for pkgdir in $PKGDIRLIST ; do if [ -n "$INSTALL" ];then pkg_install $pkgname $pkgdir $INSTALL fi - elif [ -n "$opt_v" ];then + elif [ -n "$opt_v" ];then echo "$pkgname: OK" fi done |