xbps-triggers: system-accounts: fail gracefully if required utils are not available.
This commit is contained in:
parent
7fef623e3b
commit
1cfc05cef3
2 changed files with 19 additions and 3 deletions
|
@ -38,9 +38,9 @@ group_add() {
|
||||||
$GROUPADD -r ${_grname} >/dev/null 2>&1
|
$GROUPADD -r ${_grname} >/dev/null 2>&1
|
||||||
fi
|
fi
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Created ${grp} ($use_gid) system group."
|
echo "Created ${_grname} ($use_gid) system group."
|
||||||
else
|
else
|
||||||
echo "Failed to create ${grp} ($use_gid) system group!"
|
echo "Failed to create ${_grname} ($use_gid) system group!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -74,11 +74,19 @@ run)
|
||||||
post-install)
|
post-install)
|
||||||
# System groups required by a package.
|
# System groups required by a package.
|
||||||
for grp in ${system_groups}; do
|
for grp in ${system_groups}; do
|
||||||
|
if [ ! -x "$GROUPADD" ]; then
|
||||||
|
echo "WARNING: cannot create ${grp} system group (missing groupadd)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
group_add $grp
|
group_add $grp
|
||||||
done
|
done
|
||||||
|
|
||||||
# System user/group required by a package.
|
# System user/group required by a package.
|
||||||
for acct in ${system_accounts}; do
|
for acct in ${system_accounts}; do
|
||||||
|
if [ ! -x "$USERADD" ]; then
|
||||||
|
echo "WARNING: cannot create ${acct} system user/group (missing useradd)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
eval homedir="\$${acct}_homedir"
|
eval homedir="\$${acct}_homedir"
|
||||||
eval shell="\$${acct}_shell"
|
eval shell="\$${acct}_shell"
|
||||||
eval descr="\$${acct}_descr"
|
eval descr="\$${acct}_descr"
|
||||||
|
@ -110,12 +118,20 @@ run)
|
||||||
#
|
#
|
||||||
if [ "$UPDATE" = "no" ]; then
|
if [ "$UPDATE" = "no" ]; then
|
||||||
for acct in ${system_accounts}; do
|
for acct in ${system_accounts}; do
|
||||||
|
if [ ! -x "$USERDEL" ]; then
|
||||||
|
echo "WARNING: cannot remove ${acct} system user/group (missing userdel)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
$USERDEL ${acct} >/dev/null 2>&1
|
$USERDEL ${acct} >/dev/null 2>&1
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Removed ${acct} system user/group."
|
echo "Removed ${acct} system user/group."
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
for grp in ${system_groups}; do
|
for grp in ${system_groups}; do
|
||||||
|
if [ ! -x "$GROUPDEL" ]; then
|
||||||
|
echo "WARNING: cannot remove ${acct} system group (missing groupdel)"
|
||||||
|
continue
|
||||||
|
fi
|
||||||
$GROUPDEL ${grp} >/dev/null 2>&1
|
$GROUPDEL ${grp} >/dev/null 2>&1
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
echo "Removed ${grp} system group."
|
echo "Removed ${grp} system group."
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'xbps-triggers'
|
# Template file for 'xbps-triggers'
|
||||||
pkgname=xbps-triggers
|
pkgname=xbps-triggers
|
||||||
version=0.65
|
version=0.66
|
||||||
revision=1
|
revision=1
|
||||||
short_desc="The XBPS triggers for Void Linux"
|
short_desc="The XBPS triggers for Void Linux"
|
||||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||||
|
|
Loading…
Reference in a new issue