pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Re: pkg/35026 (new option for pkg_chk for using SU_CMD from mk.conf)
Synopsis: new option for pkg_chk for using SU_CMD from mk.conf
State-Changed-From-To: open->feedback
State-Changed-By: abs%netbsd.org@localhost
State-Changed-When: Wed, 20 Dec 2006 16:00:16 +0000
State-Changed-Why:
Would having pkg_chk automatically use SU_CMD if the user is non root cover
your needs? something like:
Index: files/pkg_chk.sh
===================================================================
RCS file: /cvsroot/pkgsrc/pkgtools/pkg_chk/files/pkg_chk.sh,v
retrieving revision 1.44
diff -u -p -r1.44 pkg_chk.sh
--- files/pkg_chk.sh 5 Nov 2006 21:53:27 -0000 1.44
+++ files/pkg_chk.sh 20 Dec 2006 15:58:02 -0000
@@ -97,7 +97,7 @@ delete_pkgs()
{
for pkg in $* ; do
if [ -d $PKG_DBDIR/$pkg ] ; then
- run_cmd "${PKG_DELETE} -r $pkg" 1
+ run_cmd_su "${PKG_DELETE} -r $pkg" 1
fi
done
}
@@ -173,9 +173,10 @@ extract_variables()
if [ -z "$opt_b" -o -n "$opt_s" -o -d $PKGSRCDIR/pkgtools/pkg_chk ] ; then
cd $PKGSRCDIR/pkgtools/pkg_chk
- extract_make_vars Makefile AWK GREP GZIP_CMD SED SORT TSORT PACKAGES \
- PKG_ADD PKG_DELETE PKG_INFO PKG_DBDIR PKGCHK_CONF \
- PKGCHK_UPDATE_CONF PKGCHK_TAGS PKGCHK_NOTAGS PKG_SUFX
+ extract_make_vars Makefile \
+ AWK GREP GZIP_CMD ID PACKAGES PKGCHK_CONF PKGCHK_NOTAGS \
+ PKGCHK_TAGS PKGCHK_UPDATE_CONF PKG_ADD PKG_DBDIR PKG_DELETE \
+ PKG_INFO PKG_SUFX SED SORT SU_CMD TSORT
if [ -z "$PACKAGES" ];then
PACKAGES=$PKGSRCDIR/packages
fi
@@ -489,7 +490,7 @@ pkg_install()
if [ -n "$saved_PKG_PATH" ] ; then
export PKG_PATH=$saved_PKG_PATH
fi
- run_cmd "${PKG_ADD} $PACKAGES/$PKGNAME$PKG_SUFX"
+ run_cmd_su "${PKG_ADD} $PACKAGES/$PKGNAME$PKG_SUFX"
if [ -n "$saved_PKG_PATH" ] ; then
unset PKG_PATH
fi
@@ -548,6 +549,15 @@ run_cmd()
fi
}
+run_cmd_su()
+ {
+ if [ -n "$SU_CMD" ]; then
+ run_cmd "${SU_CMD} '$1'" "$2"
+ else
+ run_cmd "$1" "$2"
+ fi
+ }
+
set_path()
{
arg=$1
@@ -614,7 +624,7 @@ verbose_var()
fi
}
-args=$(getopt BC:D:L:P:U:abcfghiklNnpqrsSuv "$@")
+args=$(getopt BC:D:L:P:U:abcfghiklNnpqrsuv "$@")
if [ $? != 0 ]; then
opt_h=1
fi
@@ -679,15 +689,16 @@ test -n "$AWK" || AWK="@AWK@"
test -n "$GREP" || GREP="@GREP@"
test -n "$GZIP_CMD" || GZIP_CMD="@GZIP_CMD@"
export GZIP_CMD
+test -n "$ID" || ID="@ID@"
test -n "$MAKE" || MAKE="@MAKE@"
test -n "$MAKECONF" || MAKECONF="@MAKECONF@"
test -n "$PKG_ADD" || PKG_ADD="@PKG_ADD@"
+test -n "$PKG_DBDIR" || PKG_DBDIR="@PKG_DBDIR@"
test -n "$PKG_DELETE" || PKG_DELETE="@PKG_DELETE@"
test -n "$PKG_INFO" || PKG_INFO="@PKG_INFO@"
test -n "$SED" || SED="@SED@"
test -n "$SORT" || SORT="@SORT@"
test -n "$TSORT" || TSORT="@TSORT@"
-test -n "$PKG_DBDIR" || PKG_DBDIR="@PKG_DBDIR@"
if [ ! -f $MAKECONF ] ; then
if [ -f @PREFIX@/etc/mk.conf ] ; then
@@ -729,6 +740,10 @@ if [ -d $PACKAGES/All ] ; then
PACKAGES="$PACKAGES/All"
fi
+if [ `${ID} -u` != 0 ] ; then
+ SU_CMD=
+fi
+
if [ -n "$opt_N" ]; then
${PKG_INFO} | \
${SED} -e "s/[ ].*//" -e "s/-[^-]*$//" \
(above patch may have whitespace mangling - use -l to apply)
Home |
Main Index |
Thread Index |
Old Index