Images: Misc changes

This commit is contained in:
Dylan Araps 2016-11-13 19:25:29 +11:00
parent 902976e618
commit 716afbd937
1 changed files with 4 additions and 4 deletions

View File

@ -1464,7 +1464,7 @@ get_term_font() {
case "$term" in case "$term" in
"urxvt" | "urxvtd" | "xterm") "urxvt" | "urxvtd" | "xterm")
term_font="$(grep -i -F "${term/d}*font" <<< "$(xrdb -query)")" term_font="$(grep -i -F "${term/d}*font" < <(xrdb -query))"
term_font="${term_font/*font:}" term_font="${term_font/*font:}"
term_font="$(trim "$term_font")" term_font="$(trim "$term_font")"
@ -1864,8 +1864,8 @@ get_image_program() {
get_ascii() { get_ascii() {
if [[ ! -f "$ascii" || "$ascii" == "distro" ]]; then if [[ ! -f "$ascii" || "$ascii" == "distro" ]]; then
# Error message # Error message
[[ "$ascii" != "distro" ]] && \ [[ "$ascii" != "distro" ]] && [[ ! -f "$ascii" ]] && \
[[ ! -f "$ascii" ]] && err "Ascii: Ascii file not found, using distro ascii." err "Ascii: Ascii file not found, using distro ascii."
# Lowercase the distro name # Lowercase the distro name
if (("$version" <= 3)); then if (("$version" <= 3)); then
@ -1999,7 +1999,7 @@ get_wallpaper() {
;; ;;
esac esac
# If image is an xml file don't use it. # If image is an xml file, don't use it.
[[ "${image/*\./}" == "xml" ]] && image="" [[ "${image/*\./}" == "xml" ]] && image=""
# Error msg # Error msg