[Lunar-commits] CVS: moonbase/x11/XOrg POST_INSTALL, 1.9, 1.10 xsession, 1.1, 1.2

[Florin Braescu]

Update of /var/cvs/lunar/moonbase/x11/XOrg
In directory espresso.foo-projects.org:/tmp/cvs-serv3434

Modified Files:
	POST_INSTALL xsession 
Log Message:
some small tweaks.

Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/POST_INSTALL,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- POST_INSTALL	9 Mar 2005 02:24:45 -0000	1.9
+++ POST_INSTALL	11 Apr 2005 18:04:23 -0000	1.10
@@ -1,7 +1,7 @@
-if    module_installed  NVIDIA;  then  lin  NVIDIA;  fi
-if    module_installed  fontconfig; then lin -c fontconfig; fi
-if    module_installed  glut; then lin -c glut; fi
-if    module_installed  openMotif; then lin -c openMotif; fi
+if  module_installed  NVIDIA;      then  lin NVIDIA;         fi
+if  module_installed  fontconfig;  then  lin -c fontconfig;  fi
+if  module_installed  glut;        then  lin -c glut;        fi
+if  module_installed  openMotif;   then  lin -c openMotif;   fi
 
 if ! grep -q '. /etc/profile' /etc/X11/xdm/Xsession; then
   sedit 2s:#:.\ /etc/profile: /etc/X11/xdm/Xsession

Index: xsession
===================================================================
RCS file: /var/cvs/lunar/moonbase/x11/XOrg/xsession,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xsession	7 Apr 2004 17:51:22 -0000	1.1
+++ xsession	11 Apr 2005 18:04:23 -0000	1.2
@@ -1,33 +1,28 @@
 #!/bin/sh
 
-if    [  -e /usr/bin/xscreensaver  ];  then  
-                     xscreensaver -no-splash &
+if  [ -e /usr/bin/xscreensaver ]; then  
+     xscreensaver -no-splash &
 fi
 
-if    [  -x /usr/bin/enlightenment  ]
-then  exec           enlightenment
-
-elif  [  -x /opt/lunar/kde/3/bin/startkde  ]
-then  exec  /opt/lunar/kde/3/bin/startkde
-
-elif  [  -x /opt/lunar/kde/2/bin/startkde  ]
-then  exec  /opt/lunar/kde/2/bin/startkde
+if  [ -x /usr/bin/enlightenment ]
+  then  exec  enlightenment
 
-elif  [  -x /usr/bin/wmaker  ]
-then  [  -d ~/GNUstep        ]  ||
-                     wmaker.inst
-      exec           wmaker
+  elif  [ -x $KDEDIR/bin/startkde ]
+  then  exec  $KDEDIR/bin/startkde
 
-elif  [  -x /usr/bin/icewm  ]
-then  exec           icewm
+  elif  [ -x /usr/bin/wmaker ]
+  then  [ -d ~/GNUstep       ] || wmaker.inst
+        exec  wmaker
 
-elif  [  -x /usr/bin/blackbox  ]
-then  exec           blackbox
+  elif  [ -x /usr/bin/icewm ]
+  then  exec  icewm
 
-elif  [  -x /usr/bin/fvwm2  ]
-then  exec           fvwm2
+  elif  [ -x /usr/bin/blackbox ]
+  then  exec  blackbox
 
-elif  [  -x /usr/bin/gnome-session ]
-then  exec           gnome-session 
+  elif  [ -x /usr/bin/fvwm2 ]
+  then  exec  fvwm2
 
+  elif  [ -x /usr/bin/gnome-session ]
+  then  exec  gnome-session 
 fi