Merge pull request #191 from jturner314/rm-redundant-check

Remove redundant test for $DISPLAY
This commit is contained in:
Jaromil 2015-02-18 21:25:38 +01:00
commit 50fc8ccf6b

16
tomb
View File

@ -390,15 +390,13 @@ EOF`
if _is_found "pinentry-gtk-2"; then if _is_found "pinentry-gtk-2"; then
gtkrc="" gtkrc=""
[[ "$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
}
[[ "$gtkrc" = "" ]] || { [[ "$gtkrc" = "" ]] || {
gtkrc_old="$GTK2_RC_FILES" gtkrc_old="$GTK2_RC_FILES"
export GTK2_RC_FILES="$gtkrc" export GTK2_RC_FILES="$gtkrc"