diff --git a/srcpkgs/xbps-triggers/files/system-accounts b/srcpkgs/xbps-triggers/files/system-accounts index 77d840f2427..d48e9b7a2cf 100755 --- a/srcpkgs/xbps-triggers/files/system-accounts +++ b/srcpkgs/xbps-triggers/files/system-accounts @@ -82,7 +82,6 @@ run) for acct in ${system_accounts}; do _uname="${acct%:*}" _uid="${acct#*:}" - [ "${_uid}" != "${_uname}" ] && use_id="-u ${_uid} -g ${_uid}" eval homedir="\$${_uname}_homedir" eval shell="\$${_uname}_shell" @@ -94,6 +93,9 @@ run) [ -z "$descr" ] && descr="${_uname} unprivileged user" [ -n "$groups" ] && user_groups="-G $groups" + [ "${_uid}" != "${_uname}" ] && + use_id="-u ${_uid} -g ${pgroup:-${_uid}}" + if [ -z "$USERADD" -a -z "$GETENT" -a -z "$PASSWD" ]; then echo "WARNING: cannot create ${acct} system user/group (missing useradd/getent/passwd)" echo "The following system account must be created:" diff --git a/srcpkgs/xbps-triggers/template b/srcpkgs/xbps-triggers/template index e4b1dd25f41..c80bb30d3f5 100644 --- a/srcpkgs/xbps-triggers/template +++ b/srcpkgs/xbps-triggers/template @@ -1,13 +1,13 @@ # Template file for 'xbps-triggers' pkgname=xbps-triggers -version=0.113 -revision=3 +version=0.114 +revision=1 archs=noarch bootstrap=yes -short_desc="The XBPS triggers for Void Linux" +short_desc="XBPS triggers for Void Linux" maintainer="Enno Boland " +license="Public Domain" homepage="https://voidlinux.org" -license="BSD-2-clause" do_install() { _triggersdir=usr/libexec/${pkgname}