xbps-triggers: update PATH in relevant triggers.

This is required for the /usr/sbin -> /usr/bin transition...
This commit is contained in:
Juan RP 2015-06-02 20:50:04 +02:00
parent edb8e444a0
commit 06e6de5bc2
4 changed files with 12 additions and 10 deletions

View file

@ -18,9 +18,9 @@ PKGNAME="$3"
VERSION="$4"
UPDATE="$5"
DKMS=usr/sbin/dkms
DKMS=dkms
export PATH="$PATH:/usr/local/bin"
export PATH="usr/bin:usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
remove_modules()
{

View file

@ -34,12 +34,12 @@ PKGNAME="$3"
VERSION="$4"
UPDATE="$5"
export PATH="$PATH:/usr/local/bin"
export PATH="usr/bin:/usr/sbin:/usr/sbin:/usr/bin:/sbin:/bin"
update_ldcache() {
if [ -x sbin/ldconfig ]; then
if [ -x sbin/ldconfig -o -x bin/ldconfig ]; then
echo "Updating ldconfig(8) cache..."
sbin/ldconfig -X || :
ldconfig -X || :
fi
}

View file

@ -14,6 +14,8 @@ PKGNAME="$3"
VERSION="$4"
UPDATE="$5"
export PATH="usr/sbin:usr/bin:/usr/sbin:/usr/bin:/sbin:/bin"
group_add() {
local _grname _gid use_gid
@ -48,16 +50,16 @@ run)
exit 0
fi
if [ -x sbin/useradd ]; then
if [ -x sbin/useradd -o -x bin/useradd ]; then
USERADD=1
fi
if [ -x sbin/userdel ]; then
if [ -x sbin/userdel -o -x bin/userdel ]; then
USERDEL=1
fi
if [ -x sbin/groupadd ]; then
if [ -x sbin/groupadd -o -x bin/groupadd ]; then
GROUPADD=1
fi
if [ -x sbin/groupdel ]; then
if [ -x sbin/groupdel -o -x bin/groupdel ]; then
GROUPDEL=1
fi
if [ -x bin/getent -o -x sbin/getent ]; then

View file

@ -1,6 +1,6 @@
# Template file for 'xbps-triggers'
pkgname=xbps-triggers
version=0.95
version=0.96
revision=1
noarch=yes
bootstrap=yes