# HG changeset patch # User Christophe Lincoln # Date 1481568199 -3600 # Node ID 4b4df41dc0fe6677ad8ae1a8832beafbb555f182 # Parent 67fec63c26264dd730ac90ce7f7439e8677d5801 tazu: check for empty vars diff -r 67fec63c2626 -r 4b4df41dc0fe tazu/tazu --- a/tazu/tazu Mon Dec 12 19:20:50 2016 +0100 +++ b/tazu/tazu Mon Dec 12 19:43:19 2016 +0100 @@ -41,6 +41,11 @@ echo "No user account for: $user" } +deluser() { + rm -rf "${people}/${user}" + sed -i "/^${user}:/"d $authfile +} + # # Commands # @@ -77,15 +82,27 @@ if ! [ -f "$people/$user/account.conf" ]; then echo -n "$(colorize 30 "$user")" echo -e "\\033[16GMissing account.conf" - if [ "$clean" ]; then # --clean - rm -rf "${people}/${user}" - sed -i "/^${user}:/"d $authfile + [ "$clean" ] && deluser + else # check empty VALUES + . "$people/$user/account.conf" + if [ -z "$NAME" ]; then + echo -n "$(colorize 30 "$user")" + echo -e "\\033[16GMissing NAME" fi - #else -- check empty VALUES + if [ -z "$MAIL" ]; then + echo -n "$(colorize 30 "$user")" + echo -e "\\033[16GMissing MAIL" + fi + if [ -z "$KEY" ]; then + echo -n "$(colorize 30 "$user")" + echo -e "\\033[16GMissing KEY" + fi + [ "$clean" ] && deluser + unset NAME MAIL KEY fi done echo "$(colorize 33 "Checking auth file...")" - for user in "$(cat $authfile | cut -d : -f 1)" + for user in $(cat $authfile | cut -d : -f 1) do if ! [ -d "$people/$user" ]; then echo -n "$(colorize 30 "$user")" @@ -113,9 +130,7 @@ # Delete a user if [ -d "${people}/${user}" ]; then echo -n "Deleting user: $(colorize 34 "$user")" - rm -rf "${people}/${user}" - sed -i "/^${user}:/"d $authfile - status + deluser && status else no_account fi ;;