X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;ds=sidebyside;f=xinitrc;h=3688145e62834327a1969a01fb8efc6f3d0bdbf4;hb=8f330d714255c0bd075fa47f869ab2c1a387aef3;hp=002c4c1278d92c092707e2f88e83040543db6482;hpb=12d6b4f58de78a9874e4632a8e96f0a397fd458d;p=config%2Fdotfiles.git

diff --git a/xinitrc b/xinitrc
index 002c4c1..3688145 100755
--- a/xinitrc
+++ b/xinitrc
@@ -2,11 +2,28 @@
 
 # startx configuration file.
 
+# 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/>.
+
 
 # Start ssh-agent if we have private keys, thanks to
 # http://code.haskell.org/XMonadContrib/scripts/xinitrc (read on 2011-06-19).
 if [ -x /usr/bin/ssh-agent -a -f "$HOME/.ssh/id_rsa" ]; then
-    eval `/usr/bin/ssh-agent`
+    # -s to force bourne shell output. This file is a bourne shell script even
+    # if the environment might suggest otherwise.
+    eval `/usr/bin/ssh-agent -s`
 fi
 
 # Use a black background for the root window.
@@ -33,7 +50,7 @@ if [ -f ~/.background ]; then
     fi
 fi
 
-# Display reminders.
+# Display timed reminders and recheck the file for changes every minute (-z1).
 if [ -x /usr/bin/remind -a -f ~/.reminders ]; then
     remind -z1 -k'.shell/bin/notify.py %s &' ~/.reminders &
 fi