Llewellyn/Tomb
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/Tomb.git synced 2025-02-02 11:58:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

addressing comments on last commit with a few fixes

Browse Source
This commit is contained in:
Jaromil 2014-11-26 17:24:11 +01:00
parent 47652747c3
commit 7a8a8666ba
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
tomb
View File

@ -234,10 +234,9 @@ _plot() {
# Provide a random filename in shared memory # Provide a random filename in shared memory
_tmp_create() { _tmp_create() {
[[ -d "$TMPPREFIX" ]] || { [[ -d "$TMPPREFIX" ]] || {
sudo mkdir -m 777 "$TMPPREFIX"
[[ $? == 0 ]] || _failure "Fatal error creating the temporary directory: ::1 temp dir::" "$TMPPREFIX"
# we create the tempdir with the sticky bit on # we create the tempdir with the sticky bit on
sudo chmod o+t "$TMPPREFIX" sudo mkdir -m 1777 "$TMPPREFIX"
[[ $? == 0 ]] || _failure "Fatal error creating the temporary directory: ::1 temp dir::" "$TMPPREFIX"
} }
# We're going to add one more $RANDOM for each time someone complain # We're going to add one more $RANDOM for each time someone complain
@ -339,20 +338,20 @@ ask_password() {
local description="$1" local description="$1"
local title="${2:-Enter tomb password.}" local title="${2:-Enter tomb password.}"
local _output local output
local _password local password
local _gtkrc local gtkrc
local _theme local theme
[[ "$DISPLAY" = "" ]] || { [[ "$DISPLAY" = "" ]] || {
_theme=/share/themes/tomb/gtk-2.0-key/gtkrc theme=/share/themes/tomb/gtk-2.0-key/gtkrc
for i in /usr/local /usr; do for i in /usr/local /usr; do
[[ -r $i/$_theme ]] && { [[ -r $i/$theme ]] && {
_gtkrc=$i/$_theme gtkrc=$i/$theme
break } break }
done } done }
_output=`cat <<EOF | GTK2_RC_FILES="$_gtkrc" pinentry-gtk-2 output=`cat <<EOF | GTK2_RC_FILES="$gtkrc" pinentry-gtk-2
OPTION ttyname=$TTY OPTION ttyname=$TTY
OPTION lc-ctype=$LANG OPTION lc-ctype=$LANG
SETTITLE $title SETTITLE $title
@ -362,22 +361,22 @@ GETPIN
EOF` EOF`
# parse the pinentry output # parse the pinentry output
for i in ${(f)_output}; do for i in ${(f)output}; do
[[ "$i" =~ "^ERR.*" ]] && { [[ "$i" =~ "^ERR.*" ]] && {
_warning "Pinentry error: ::1 error::" ${i[(w)3]} _warning "Pinentry error: ::1 error::" ${i[(w)3]}
print "canceled" print "canceled"
return 1 } return 1 }
# here the password is found # here the password is found
[[ "$i" =~ "^D .*" ]] && _password="${i##D }" [[ "$i" =~ "^D .*" ]] && password="${i##D }"
done done
[[ "$_password" = "" ]] && { [[ "$password" = "" ]] && {
_warning "Empty password" _warning "Empty password"
print "empty" print "empty"
return 1 } return 1 }
print "$_password" print "$password"
return 0 return 0
} }