slitaz-dev-tools rev 262
tazu: check for empty vars
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Mon Dec 12 19:43:19 2016 +0100 (2016-12-12) |
parents | 67fec63c2626 |
children | e2eaf966072e |
files | tazu/tazu |
line diff
1.1 --- a/tazu/tazu Mon Dec 12 19:20:50 2016 +0100 1.2 +++ b/tazu/tazu Mon Dec 12 19:43:19 2016 +0100 1.3 @@ -41,6 +41,11 @@ 1.4 echo "No user account for: $user" 1.5 } 1.6 1.7 +deluser() { 1.8 + rm -rf "${people}/${user}" 1.9 + sed -i "/^${user}:/"d $authfile 1.10 +} 1.11 + 1.12 # 1.13 # Commands 1.14 # 1.15 @@ -77,15 +82,27 @@ 1.16 if ! [ -f "$people/$user/account.conf" ]; then 1.17 echo -n "$(colorize 30 "$user")" 1.18 echo -e "\\033[16GMissing account.conf" 1.19 - if [ "$clean" ]; then # --clean 1.20 - rm -rf "${people}/${user}" 1.21 - sed -i "/^${user}:/"d $authfile 1.22 + [ "$clean" ] && deluser 1.23 + else # check empty VALUES 1.24 + . "$people/$user/account.conf" 1.25 + if [ -z "$NAME" ]; then 1.26 + echo -n "$(colorize 30 "$user")" 1.27 + echo -e "\\033[16GMissing NAME" 1.28 fi 1.29 - #else -- check empty VALUES 1.30 + if [ -z "$MAIL" ]; then 1.31 + echo -n "$(colorize 30 "$user")" 1.32 + echo -e "\\033[16GMissing MAIL" 1.33 + fi 1.34 + if [ -z "$KEY" ]; then 1.35 + echo -n "$(colorize 30 "$user")" 1.36 + echo -e "\\033[16GMissing KEY" 1.37 + fi 1.38 + [ "$clean" ] && deluser 1.39 + unset NAME MAIL KEY 1.40 fi 1.41 done 1.42 echo "$(colorize 33 "Checking auth file...")" 1.43 - for user in "$(cat $authfile | cut -d : -f 1)" 1.44 + for user in $(cat $authfile | cut -d : -f 1) 1.45 do 1.46 if ! [ -d "$people/$user" ]; then 1.47 echo -n "$(colorize 30 "$user")" 1.48 @@ -113,9 +130,7 @@ 1.49 # Delete a user 1.50 if [ -d "${people}/${user}" ]; then 1.51 echo -n "Deleting user: $(colorize 34 "$user")" 1.52 - rm -rf "${people}/${user}" 1.53 - sed -i "/^${user}:/"d $authfile 1.54 - status 1.55 + deluser && status 1.56 else 1.57 no_account 1.58 fi ;;