kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix bug in handling of wildcarded package names on the command line.

Browse source 
Bump version to 1.6.1
This commit is contained in:
erh 2004-07-19 17:38:36 +00:00
parent 72ffeae4fc
commit 85a992eb48
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/pkg_tarup/Makefile
View file

@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.20 2004/07/14 16:08:48 erh Exp $
# $NetBSD: Makefile,v 1.21 2004/07/19 17:38:36 erh Exp $
DISTNAME= pkg_tarup-1.6
DISTNAME= pkg_tarup-1.6.1
CATEGORIES= pkgtools
MASTER_SITES= # empty
DISTFILES= # empty

31
pkgtools/pkg_tarup/files/pkg_tarup
View file

@ -1,6 +1,6 @@
#! @SH@
#
# $Id: pkg_tarup,v 1.13 2004/07/14 16:08:48 erh Exp $
# $Id: pkg_tarup,v 1.14 2004/07/19 17:38:36 erh Exp $
#
# Tar up installed package
#
@ -133,14 +133,28 @@ create_package()
add_to_list()
{
local added
added=0
oIFS="$IFS"
IFS="
"
# Get expanded name, and escape quotes
rPKG=`pkg_info -e "$1" | ${SED} -e's/\"/\\\"/g'`
if [ -z "$rPKG" -o -f "${PKG_DBDIR}/${rPKG}" ] ; then
${ECHO} "Error: package $1 not found"
usage "$0"
fi
if ! ${ECHO} "${PKGS}" | ${GREP} -q "\"${rPKG}\"" ; then
PKGS="${PKGS} \"${rPKG}\""
for rPKG in `pkg_info -e "$1" | ${SED} -e's/\"/\\\"/g'` ; do
if [ -z "$rPKG" -o -f "${PKG_DBDIR}/${rPKG}" ] ; then
${ECHO} "Error: package $1 not found"
usage "$0"
fi
added=1
if ! ${ECHO} "${PKGS}" | ${GREP} -q "\"${rPKG}\"" ; then
PKGS="${PKGS} \"${rPKG}\""
fi
done
IFS="$oIFS"
if [ $added -eq 0 ] ; then
${ECHO} "Warning: no package matching $1 found"
fi
}
@ -188,6 +202,7 @@ while [ $# -gt 0 ] ; do
shift
done
if [ -z "${PKGS}" ] ; then
${ECHO} "ERROR: No packages to tarup identified!"
usage "$0"
fi
FOR="