xinitrc: Move options to the top.

[config/dotfiles.git] / setup.sh

diff --git a/setup.sh b/setup.sh
index efd7255a281c935fc698834c595e03b584b569af..6a980a346d90661237a8366713f74f50c17e34a6 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,23 @@
 
 # Setup script for X11 configuration files.
 
+# Copyright (C) 2011-2012  Simon Ruderich
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+set -e
 
 . ../lib.sh
 
@@ -34,9 +51,12 @@ if installed X; then
     sed 's/^#/!/' Xdefaults > Xdefaults.tmp
     mv Xdefaults.tmp Xdefaults
 
-    if [ x`os` != xdarwin ]; then
+    if test ! "x`os`" = xdarwin; then
         link xinitrc ~/.xinitrc
     fi
+    if test -f xinitrc.local; then
+        link xinitrc.local ~/.xinitrc.local
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
     link XCompose ~/.XCompose
@@ -49,3 +69,11 @@ if installed zathura; then
     mkdir -p ~/.config/zathura
     link zathurarc ~/.config/zathura/zathurarc
 fi
+
+if installed feh; then
+    mkdir -p ~/.config
+    link feh ~/.config/feh
+    # Older feh versions only support theme options and configure them through
+    # ~/.fehrc.
+    link feh/themes ~/.fehrc
+fi