Llewellyn/Tomb
1
1
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-06-16 00:52:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix wrong comparison of $pass_asked left by last commits

Browse Source 
fix #404
This commit is contained in:
Jaromil 2020-12-29 10:52:16 +01:00
parent 7a81ad032d
commit d8360688b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tomb
View File

@ -398,7 +398,7 @@ ask_password() {
pass_asked=1
}
fi
if [[ ! -z $DISPLAY ]] && [[ -z $pass_asked ]]; then
if [[ ! -z $DISPLAY ]] && [[ $pass_asked == 0 ]]; then
_verbose "X11 display detected"
if _is_found "pinentry-gtk-2"; then
_verbose "using pinentry-gtk2"
@ -422,7 +422,7 @@ ask_password() {
pass_asked=1
fi
fi
if [[ -z $pass_asked ]]; then
if [[ $pass_asked == 0 ]]; then
_verbose "no display detected"
_is_found "pinentry-curses" && {
_verbose "using pinentry-curses with no display"
@ -431,14 +431,14 @@ ask_password() {
}
fi
[[ -z $pass_asked ]] &&
[[ $pass_asked == 0 ]] &&
_failure "Cannot find any pinentry-curses and no DISPLAY detected."
# parse the pinentry output
local pinentry_error
for i in ${(f)output}; do
[[ "$i" =~ "^ERR.*" ]] && {
pinentry_error="${i[(w)3]}"
[[ "$i" =~ "^ERR.*" ]] && {
pinentry_error="${i[(w)3]}"
}
# here the password is found