xinitrc: Don't create ~/.fehbg when using feh to set the background.

[config/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 4e5f7bbefe217598697ae93d1d18bc300b3bea41..35bbe22f6157952d17fd9bf583f040198f3598ee 100755 (executable)
--- a/xinitrc
+++ b/xinitrc
@@ -18,6 +18,15 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
+# Some systems don't set the LANG environment variable when starting xinitrc,
+# this causes problems for rxvt-unicode-256color which fails to display UTF-8
+# characters correctly when LANG is missing and for notify.py which also needs
+# LANG set (for Python's decode() function). Therefore set it here, might be
+# overwritten by shell setup scripts.
+LANG=en_US.UTF-8
+export LANG
+
+
 # Start ssh-agent if we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
 if test -x /usr/bin/ssh-agent && test -f "$HOME/.ssh/id_rsa"; then
@@ -46,11 +55,13 @@ if test -f "$HOME/.xinitrc.local"; then
 fi
 
 # Change the background if available.
-if test -f "$HOME/.background" && test -n $set_background; then
+if test -f "$HOME/.background" && test -n "$set_background"; then
     if test -x /usr/bin/hsetroot; then
         hsetroot -full "$HOME/.background"
     elif test -x /usr/bin/feh; then
         feh --bg-scale "$HOME/.background"
+        # --no-fehbg is only available in recent feh releases.
+        rm -f "$HOME/.fehbg"
     fi
 fi