diff options
| author | jlam <jlam> | 2005-01-28 19:06:07 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-01-28 19:06:07 +0000 |
| commit | 81e311a1de0d23645a15b3924b44799428014089 (patch) | |
| tree | 90dabf91dd3aa88865f9409cfa91317363e7ec1d /mk/install | |
| parent | ff44088b5216d1d9d51461f8a6f8c844bf826f73 (diff) | |
| download | pkgsrc-81e311a1de0d23645a15b3924b44799428014089.tar.gz | |
Avoid hardcoding the refcount database into the INSTALL scripts. We
now simply make ${PKG_REFCOUNT_DBDIR} always be ${PKG_DBDIR}.refcount
so that it always follows the location of ${PKG_DBDIR}. This preserves
the ability for PKG_DBDIR (and PKG_REFCOUNT_DBDIR) to be different on
different machines despite using the same binary packages.
Diffstat (limited to 'mk/install')
| -rw-r--r-- | mk/install/dirs | 3 | ||||
| -rw-r--r-- | mk/install/usergroup | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/mk/install/dirs b/mk/install/dirs index 9f95755aa99..5e09564a970 100644 --- a/mk/install/dirs +++ b/mk/install/dirs @@ -47,8 +47,9 @@ TRUE="@TRUE@" SELF=$0 ACTION=$1 PKG_METADATA_DIR="${2-`${PWD_CMD}`}" -PKG_REFCOUNT_DBDIR="@PKG_REFCOUNT_DBDIR@" : ${PKGNAME=${PKG_METADATA_DIR##*/}} +: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}} +: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount} PKG_REFCOUNT_DIRS_DBDIR="${PKG_REFCOUNT_DBDIR}/dirs" diff --git a/mk/install/usergroup b/mk/install/usergroup index 1b811880488..431adaa6f1c 100644 --- a/mk/install/usergroup +++ b/mk/install/usergroup @@ -54,9 +54,9 @@ USERADD="@USERADD@" SELF=$0 ACTION=$1 PKG_METADATA_DIR="${2-`${PWD_CMD}`}" -PKG_REFCOUNT_DBDIR="@PKG_REFCOUNT_DBDIR@" : ${PKGNAME=${PKG_METADATA_DIR##*/}} -: ${PKGBASE=${PKGNAME%-[0-9]*}} +: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}} +: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount} PKG_REFCOUNT_USERS_DBDIR="${PKG_REFCOUNT_DBDIR}/users" PKG_REFCOUNT_GROUPS_DBDIR="${PKG_REFCOUNT_DBDIR}/groups" @@ -158,7 +158,7 @@ ADD) case $user in "") continue ;; esac - : ${descr:="${PKGBASE} $user user"} + : ${descr:="${PKGNAME%-[0-9]*} $user user"} : ${home:="${PKG_USER_HOME}"} : ${shell:="${PKG_USER_SHELL}"} shadow_dir="${PKG_REFCOUNT_USERS_DBDIR}/$user" |