correct checks for pinentry

tomb

@@ -525,16 +525,18 @@ ask_password() {
 	fi
 	if [[ $pass_asked == 0 ]]; then
 		_verbose "no display detected"
-		_is_found "pinentry-curses" && {
+		if _is_found "pinentry-curses"; then
 			_verbose "using pinentry-curses with no display"
 			output=$(pinentry_assuan_getpass | pinentry-curses)
 			pass_asked=1
-		}
-		_is_found "pinentry-tty" && {
+		elif _is_found "pinentry-tty"; then
 			_verbose "using pinentry-tty with no display"
 			output=$(pinentry_assuan_getpass | pinentry-tty)
 			pass_asked=1
-		}
+    else
+      # TODO: fallback to asking password using read
+		  _failure "Cannot find any pinentry and no DISPLAY detected."
+    fi
 	fi
 
 	[[ $pass_asked == 0 ]] &&
@@ -997,10 +999,11 @@ _ensure_dependencies() {
 			_failure "Missing required dependency ::1 command::.  Please install it." $req; }
 	done
   # Check for pinentry or at least pinentry-tty (which has no alias)
-  [[ ! command -v pinentry 1>/dev/null 2>/dev/null ]] &&
-    [[ ! command -v pinentry-tty 1>/dev/null 2>/dev/null ]] && {
-			_failure "Missing required dependency ::1 command::.  Please install it." pinentry; }
-
+  if ! command -v pinentry 1>/dev/null 2>/dev/null; then
+    if ! command -v pinentry-tty 1>/dev/null 2>/dev/null; then
+			_failure "Missing required dependency ::1 command::.  Please install it." pinentry
+    fi
+  fi
 	# Ensure system binaries are available in the PATH
 	path+=(/sbin /usr/sbin) # zsh magic