--- trunk/mage/usr/lib/mage/muserdel 2005/01/10 01:58:35 42 +++ trunk/mage/usr/lib/mage/muserdel 2011/04/27 09:45:07 1273 @@ -1,5 +1,10 @@ #!/bin/bash -# version: 0.3.6-r11 +# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/muserdel,v 1.4 2005-06-01 15:48:46 niro Exp $ + +# include all needed files +[ -f /etc/mage.rc.global ] && source /etc/mage.rc.global +[ -f ${MAGERC} ] && source ${MAGERC} +[ -f ${MLIBDIR}/mage4.functions.sh ] && source ${MLIBDIR}/mage4.functions.sh print_usage() { @@ -20,15 +25,24 @@ USER_TO_DEL="$1" -#start nscd to cache passwd -$(which nscd) -i passwd -# get the info -my_user="$(getent passwd ${USER_TO_DEL})" - -if [ -z "${my_user}" ] +# busybox support needed? +if need_busybox_support deluser then - echo " User '${USER_TO_DEL}' already deleted ..." -else echo " Deleting user '${USER_TO_DEL}' ..." - userdel "${USER_TO_DEL}" + deluser "${USER_TO_DEL}" + +# normal systems +else + #start nscd to cache passwd + $(which nscd) -i passwd + # get the info + my_user="$(getent passwd ${USER_TO_DEL})" + + if [ -z "${my_user}" ] + then + echo " User '${USER_TO_DEL}' already deleted ..." + else + echo " Deleting user '${USER_TO_DEL}' ..." + userdel "${USER_TO_DEL}" + fi fi