cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use PKG_DBDIR instead of hard-coding /var/db/pkg/. Do not silently revert

Browse Source 
to defaults for PORTSDIR and PKG_DBDIR if the respective directory does
not exist, but bail out.

Approved by:	netchild
This commit is contained in:
Gerald Pfeifer 2007-09-08 16:23:13 +00:00
parent 1536e73050
commit df787b975d
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=199117
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Tools/scripts/resolveportsfromlibs.sh
View File

@ -81,9 +81,21 @@ if [ -z "${PORTSDIR}" ]; then
PORTSDIR=$(make -f /etc/make.conf -V PORTSDIR)
fi
if [ -z "${PORTSDIR}" -o ! -d "${PORTSDIR}" ]; then
if [ -z "${PORTSDIR}" ]; then
PORTSDIR=/usr/ports
fi
if [ ! -d "${PORTSDIR}" ]; then
echo "PORTSDIR = ${PORTSDIR} is not a directory."
exit 1
fi
if [ -z "${PKG_DBDIR}" ]; then
PKG_DBDIR=/var/db/pkg
fi
if [ ! -d "${PKG_DBDIR}" ]; then
echo "PKG_DBDIR = ${PKG_DBDIR} is not a directory."
exit 1
fi
for i in $@; do
result=""
@ -112,9 +124,9 @@ for i in $@; do
for base in ${bases}; do
port=$(pkg_which "${base}/lib/$i")
if [ -f /var/db/pkg/$port/+CONTENTS ]; then
if [ -f $PKG_DBDIR/$port/+CONTENTS ]; then
origin=$(grep "@comment ORIGIN:" \
/var/db/pkg/$port/+CONTENTS \
$PKG_DBDIR/$port/+CONTENTS \
| sed -e 's/@comment ORIGIN://')
break
else