X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=setup.sh;h=2dc16935fca9588f90882fd30139316d6cb49800;hb=429ce4dc8ecc960043dc0258bd0f795ef66e62ba;hp=efd7255a281c935fc698834c595e03b584b569af;hpb=bd74707b46ada50095b544c02ad313efeb80b922;p=config%2Fdotfiles.git

diff --git a/setup.sh b/setup.sh
index efd7255..2dc1693 100755
--- a/setup.sh
+++ b/setup.sh
@@ -2,6 +2,21 @@
 
 # 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/>.
+
 
 . ../lib.sh
 
@@ -37,6 +52,9 @@ if installed X; then
     if [ x`os` != xdarwin ]; then
         link xinitrc ~/.xinitrc
     fi
+    if [ -f xinitrc.local ]; then
+        link xinitrc.local ~/.xinitrc.local
+    fi
     link xmodmaprc ~/.xmodmaprc
     link Xdefaults ~/.Xdefaults
     link XCompose ~/.XCompose
@@ -49,3 +67,8 @@ 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
+fi