80| and refactor `! -z` to `-n`.

Shrikant Sharat
1 parent 42b0db6c21
Showing 1 changed file with 6 additions and 3 deletions Side-by-side Diff
antigen.zsh
@@ -621,7 +621,8 @@ antigen () {
         fi
  
         # The specification for this argument, used for validations.
-        local arg_line="$(echo "$keyword_args" | egrep "^$name:?\??" | head -n1)"
+        local arg_line="$(echo "$keyword_args" |
+                            egrep "^$name:?\??" | head -n1)"
  
         # Validate argument and value.
         if [[ -z $arg_line ]]; then
@@ -629,12 +630,14 @@ antigen () {
             echo "Unknown argument '$name'." >&2
             return
  
-        elif (echo "$arg_line" | grep -l ':' &> /dev/null) && [[ -z $value ]]; then
+        elif (echo "$arg_line" | grep -l ':' &> /dev/null) &&
+                [[ -z $value ]]; then
             # This argument needs a value, but is not provided.
             echo "Required argument for '$name' not provided." >&2
             return
  
-        elif (echo "$arg_line" | grep -vl ':' &> /dev/null) && [[ ! -z $value ]]; then
+        elif (echo "$arg_line" | grep -vl ':' &> /dev/null) &&
+                [[ -n $value ]]; then
             # This argument doesn't need a value, but is provided.
             echo "No argument required for '$name', but provided '$value'." >&2
             return
...	...	@@ -621,7 +621,8 @@ antigen () {
621	621	fi
622	622
623	623	# The specification for this argument, used for validations.
624		- local arg_line="$(echo "$keyword_args" \| egrep "^$name:?\??" \| head -n1)"
	624	+ local arg_line="$(echo "$keyword_args" \|
	625	+ egrep "^$name:?\??" \| head -n1)"
625	626
626	627	# Validate argument and value.
627	628	if [[ -z $arg_line ]]; then
...	...	@@ -629,12 +630,14 @@ antigen () {
629	630	echo "Unknown argument '$name'." >&2
630	631	return
631	632
632		- elif (echo "$arg_line" \| grep -l ':' &> /dev/null) && [[ -z $value ]]; then
	633	+ elif (echo "$arg_line" \| grep -l ':' &> /dev/null) &&
	634	+ [[ -z $value ]]; then
633	635	# This argument needs a value, but is not provided.
634	636	echo "Required argument for '$name' not provided." >&2
635	637	return
636	638
637		- elif (echo "$arg_line" \| grep -vl ':' &> /dev/null) && [[ ! -z $value ]]; then
	639	+ elif (echo "$arg_line" \| grep -vl ':' &> /dev/null) &&
	640	+ [[ -n $value ]]; then
638	641	# This argument doesn't need a value, but is provided.
639	642	echo "No argument required for '$name', but provided '$value'." >&2
640	643	return