Merge branch 'master' of github.com:maxf130/dotfiles

[max/dotfiles.git] / xinitrc

diff --git a/xinitrc b/xinitrc
index 038a91443a966df376242581c901d1b898829efe..6a2e74cd24f4da1b2be7ecbc01d88f7a8d4f4790 100644 (file)
--- a/xinitrc
+++ b/xinitrc
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # ~/.xinitrc
 #
@@ -14,7 +14,8 @@ fi
 
 
 # Load .Xresources
-[[ -f ~/.Xresources ]] && xrdb -merge ~/.Xresources
+xrdb -merge ~/.Xresources &> /dev/null
+
 
 # Set caps lock as control to avoid emacs pinky
 setxkbmap -option ctrl:nocaps