From 06e6de5bc247b0d22af1b3f5ab4c04a2f6c9eac8 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Tue, 2 Jun 2015 20:50:04 +0200
Subject: [PATCH] xbps-triggers: update PATH in relevant triggers.

This is required for the /usr/sbin -> /usr/bin transition...
---
 srcpkgs/xbps-triggers/files/dkms            |  4 ++--
 srcpkgs/xbps-triggers/files/pycompile       |  6 +++---
 srcpkgs/xbps-triggers/files/system-accounts | 10 ++++++----
 srcpkgs/xbps-triggers/template              |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/xbps-triggers/files/dkms b/srcpkgs/xbps-triggers/files/dkms
index 526d83cd408..d110005c2f8 100755
--- a/srcpkgs/xbps-triggers/files/dkms
+++ b/srcpkgs/xbps-triggers/files/dkms
@@ -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()
 {
diff --git a/srcpkgs/xbps-triggers/files/pycompile b/srcpkgs/xbps-triggers/files/pycompile
index 632c36e2999..339d230fe29 100755
--- a/srcpkgs/xbps-triggers/files/pycompile
+++ b/srcpkgs/xbps-triggers/files/pycompile
@@ -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
 }
 
diff --git a/srcpkgs/xbps-triggers/files/system-accounts b/srcpkgs/xbps-triggers/files/system-accounts
index 06895bc7cb3..7bf51e5627a 100755
--- a/srcpkgs/xbps-triggers/files/system-accounts
+++ b/srcpkgs/xbps-triggers/files/system-accounts
@@ -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
diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template
index 0e6eb00f8ba..86434e35873 100644
--- a/srcpkgs/xbps-triggers/template
+++ b/srcpkgs/xbps-triggers/template
@@ -1,6 +1,6 @@
 # Template file for 'xbps-triggers'
 pkgname=xbps-triggers
-version=0.95
+version=0.96
 revision=1
 noarch=yes
 bootstrap=yes