]> Frank Brehm's Git Trees - config/samara/etc.git/commitdiff
saving uncommitted changes in /etc prior to emerge run
authorFrank Brehm <frank.brehm@profitbricks.com>
Mon, 7 Dec 2015 17:15:11 +0000 (18:15 +0100)
committerroot Samara <root@samara.pb.local>
Mon, 7 Dec 2015 17:15:11 +0000 (18:15 +0100)
X11/chooser.sh
X11/startDM.sh
X11/xinit/xinitrc

index f24be46dc46df3316f635c9bfa17f39f6d6e6945..6d14a71d43e66b607d7d479701ee253191f7145f 100755 (executable)
@@ -2,7 +2,7 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
 # Author:  Martin Schlemmer <azarah@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/chooser.sh,v 1.5 2009/11/14 14:18:43 scarabeus Exp $
+# $Id$
 
 # Find a match for $XSESSION in /etc/X11/Sessions
 GENTOO_SESSION=""
index ebb7970400b658a57bc8e5a374350ffde4b8321f..02656595c12f3314ea9900211aa2e08dc60cbb1d 100755 (executable)
@@ -1,7 +1,7 @@
 #!/bin/sh
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xinit/files/startDM.sh,v 1.5 2011/01/22 15:35:49 lxnay Exp $
+# $Id$
 
 # We need to source /etc/profile for stuff like $LANG to work
 # bug #10190.
index e6dd7fe58fb5bc06fecaf667e013851c57274f44..1109fc3b778f25149c0773ed0c42ef8bba658dda 100644 (file)
@@ -1,46 +1,3 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #!/bin/sh
 
 userresources=$HOME/.Xresources
@@ -84,26 +41,25 @@ fi
 
 # start some nice programs
 
-
 if [ -n "`/etc/X11/chooser.sh`" ]; then
      command="`/etc/X11/chooser.sh`"
+ command="`/etc/X11/chooser.sh`"
 else
      failsafe="yes"
+ failsafe="yes"
 fi
 
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
      for f in /etc/X11/xinit/xinitrc.d/?* ; do
-               [ -x "$f" ] && . "$f"
      done
      unset f
+ for f in /etc/X11/xinit/xinitrc.d/?* ; do
+  [ -x "$f" ] && . "$f"
+ done
+ unset f
 fi
 
 if [ -n "$failsafe" ]; then
      twm &
      xclock -geometry 50x50-1+1 &
      xterm -geometry 80x50+494+51 &
      xterm -geometry 80x20+494-0 &
      exec xterm -geometry 80x66+0+0 -name login
+ twm &
+ xclock -geometry 50x50-1+1 &
+ xterm -geometry 80x50+494+51 &
+ xterm -geometry 80x20+494-0 &
+ exec xterm -geometry 80x66+0+0 -name login
 else
      exec $command
+ exec $command
 fi