SliTaz Repositories

     1.1 --- a/tazu/tazu	Mon Dec 12 19:43:19 2016 +0100
     1.2 +++ b/tazu/tazu	Mon Dec 12 19:56:25 2016 +0100
     1.3 @@ -31,8 +31,7 @@
     1.4  
     1.5  Options:
     1.6    --admin  Make user admin
     1.7 -  --del    Delete a user
     1.8 -  --clean  check: clean users accounts
     1.9 +  --del    Delete a user account
    1.10  
    1.11  EOT
    1.12  }
    1.13 @@ -42,7 +41,9 @@
    1.14  }
    1.15  
    1.16  deluser() {
    1.17 -	rm -rf "${people}/${user}"
    1.18 +	if [ -d ]; then
    1.19 +		rm -rf "${people}/${user}"
    1.20 +	fi
    1.21  	sed -i "/^${user}:/"d $authfile
    1.22  }
    1.23  
    1.24 @@ -82,7 +83,6 @@
    1.25  			if ! [ -f "$people/$user/account.conf" ]; then
    1.26  				echo -n "$(colorize 30 "$user")"
    1.27  				echo -e "\\033[16GMissing account.conf"
    1.28 -				[ "$clean" ] && deluser
    1.29  			else # check empty VALUES
    1.30  				. "$people/$user/account.conf"
    1.31  				if [ -z "$NAME" ]; then
    1.32 @@ -97,7 +97,6 @@
    1.33  					echo -n "$(colorize 30 "$user")"
    1.34  					echo -e "\\033[16GMissing KEY"
    1.35  				fi
    1.36 -				[ "$clean" ] && deluser
    1.37  				unset NAME MAIL KEY
    1.38  			fi
    1.39  		done
    1.40 @@ -107,12 +106,10 @@
    1.41  			if ! [ -d "$people/$user" ]; then
    1.42  				echo -n "$(colorize 30 "$user")"
    1.43  				echo -e "\\033[16GMissing in DB"
    1.44 -				if [ "$clean" ]; then # --clean
    1.45 -					sed -i "/^${user}:/"d $authfile
    1.46 -				fi
    1.47  			fi
    1.48  		done
    1.49 -		separator && newline ;;
    1.50 +		separator 
    1.51 +		echo "Use 'tazu user --del' to remove a corrupted account" && newline ;;
    1.52  	*)
    1.53  		# Handle general: --options
    1.54  		case " $@ " in
    1.55 @@ -145,7 +142,6 @@
    1.56  					separator && newline
    1.57  				else
    1.58  					no_account
    1.59 -					echo ${people}/${user}
    1.60  				fi ;;
    1.61  		esac ;;
    1.62  esac