Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2024-11-22 12:35:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

improved debugging for pinentry execution

Browse Source
This commit is contained in:
Jaromil 2015-07-04 11:28:37 +02:00
parent 55d3263cac
commit e8ca2998b9
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tomb
View File

@ -377,10 +377,12 @@ ask_password() {
# make sure LANG is set, default to C # make sure LANG is set, default to C
LANG=${LANG:-C} LANG=${LANG:-C}
_verbose "asking password with tty=$TTY lc-ctype=$LANG"
if [[ "$DISPLAY" = "" ]]; then if [[ "$DISPLAY" = "" ]]; then
if _is_found "pinentry-curses"; then if _is_found "pinentry-curses"; then
_verbose "using pinentry-curses"
output=`cat <<EOF | pinentry-curses output=`cat <<EOF | pinentry-curses
OPTION ttyname=$TTY OPTION ttyname=$TTY
OPTION lc-ctype=$LANG OPTION lc-ctype=$LANG
@ -397,6 +399,7 @@ EOF`
# customized gtk2 dialog with a skull (if extras are installed) # customized gtk2 dialog with a skull (if extras are installed)
if _is_found "pinentry-gtk-2"; then if _is_found "pinentry-gtk-2"; then
_verbose "using pinentry-gtk2"
gtkrc="" gtkrc=""
theme=/share/themes/tomb/gtk-2.0-key/gtkrc theme=/share/themes/tomb/gtk-2.0-key/gtkrc
@ -422,6 +425,7 @@ EOF`
# TODO QT4 customization of dialog # TODO QT4 customization of dialog
elif _is_found "pinentry-qt4"; then elif _is_found "pinentry-qt4"; then
_verbose "using pinentry-qt4"
output=`cat <<EOF | pinentry-qt4 output=`cat <<EOF | pinentry-qt4
OPTION ttyname=$TTY OPTION ttyname=$TTY
@ -434,6 +438,7 @@ EOF`
# TODO X11 customization of dialog # TODO X11 customization of dialog
elif _is_found "pinentry-x11"; then elif _is_found "pinentry-x11"; then
_verbose "using pinentry-x11"
output=`cat <<EOF | pinentry-x11 output=`cat <<EOF | pinentry-x11
OPTION ttyname=$TTY OPTION ttyname=$TTY
@ -447,6 +452,7 @@ EOF`
else else
if _is_found "pinentry-curses"; then if _is_found "pinentry-curses"; then
_verbose "using pinentry-curses"
_warning "Detected DISPLAY, but only pinentry-curses is found." _warning "Detected DISPLAY, but only pinentry-curses is found."
output=`cat <<EOF | pinentry-curses output=`cat <<EOF | pinentry-curses