# HG changeset patch # User Christophe Lincoln # Date 1481568985 -3600 # Node ID e2eaf966072e55fc386249c40058b980a2d99323 # Parent 4b4df41dc0fe6677ad8ae1a8832beafbb555f182 tazu: dont clean all DB at once, can be dangerous... diff -r 4b4df41dc0fe -r e2eaf966072e tazu/tazu --- a/tazu/tazu Mon Dec 12 19:43:19 2016 +0100 +++ b/tazu/tazu Mon Dec 12 19:56:25 2016 +0100 @@ -31,8 +31,7 @@ Options: --admin Make user admin - --del Delete a user - --clean check: clean users accounts + --del Delete a user account EOT } @@ -42,7 +41,9 @@ } deluser() { - rm -rf "${people}/${user}" + if [ -d ]; then + rm -rf "${people}/${user}" + fi sed -i "/^${user}:/"d $authfile } @@ -82,7 +83,6 @@ if ! [ -f "$people/$user/account.conf" ]; then echo -n "$(colorize 30 "$user")" echo -e "\\033[16GMissing account.conf" - [ "$clean" ] && deluser else # check empty VALUES . "$people/$user/account.conf" if [ -z "$NAME" ]; then @@ -97,7 +97,6 @@ echo -n "$(colorize 30 "$user")" echo -e "\\033[16GMissing KEY" fi - [ "$clean" ] && deluser unset NAME MAIL KEY fi done @@ -107,12 +106,10 @@ if ! [ -d "$people/$user" ]; then echo -n "$(colorize 30 "$user")" echo -e "\\033[16GMissing in DB" - if [ "$clean" ]; then # --clean - sed -i "/^${user}:/"d $authfile - fi fi done - separator && newline ;; + separator + echo "Use 'tazu user --del' to remove a corrupted account" && newline ;; *) # Handle general: --options case " $@ " in @@ -145,7 +142,6 @@ separator && newline else no_account - echo ${people}/${user} fi ;; esac ;; esac