[23308] in Source-Commits
/svn/athena r22966 - trunk/debathena/debathena/dotfiles
daemon@ATHENA.MIT.EDU (ghudson@MIT.EDU)
Fri May 9 13:59:42 2008
Date: Fri, 9 May 2008 13:59:10 -0400 (EDT)
From: ghudson@MIT.EDU
Message-Id: <200805091759.NAA10194@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: ghudson
Date: 2008-05-09 13:59:09 -0400 (Fri, 09 May 2008)
New Revision: 22966
Added:
trunk/debathena/debathena/dotfiles/xsession.bash
Modified:
trunk/debathena/debathena/dotfiles/Makefile
trunk/debathena/debathena/dotfiles/Xsession
Log:
Add a bash version of the standard Athena xsession, and use it for
bash users.
Modified: trunk/debathena/debathena/dotfiles/Makefile
===================================================================
--- trunk/debathena/debathena/dotfiles/Makefile 2008-05-08 13:22:59 UTC (rev 22965)
+++ trunk/debathena/debathena/dotfiles/Makefile 2008-05-09 17:59:09 UTC (rev 22966)
@@ -53,6 +53,7 @@
install -c -m 0644 welcome ${DESTDIR}${PROTOTMP}
install -c -m 0755 xkill-mozilla.sh ${DESTDIR}${SYSTEM}/xkill-mozilla
install -c -m 0755 xsession ${DESTDIR}${SYSTEM}
+ install -c -m 0755 xsession.bash ${DESTDIR}${SYSTEM}
cd os/${OS} && ${MAKE} $@
cd gnome && ${MAKE} $@
Modified: trunk/debathena/debathena/dotfiles/Xsession
===================================================================
--- trunk/debathena/debathena/dotfiles/Xsession 2008-05-08 13:22:59 UTC (rev 22965)
+++ trunk/debathena/debathena/dotfiles/Xsession 2008-05-09 17:59:09 UTC (rev 22966)
@@ -14,12 +14,18 @@
defsession=1;
fi
+if [ "`basename $SHELL`" = bash ]; then
+ default_session=$initlib/xsession.bash
+else
+ default_session=$initlib/xsession
+fi
+
case $defsession in
1|4|7)
if [ -f .xsession ]; then
- session=".xsession"
+ session=.xsession
else
- session="$initlib/xsession"
+ session=$default_session
fi
case $defsession in
7)
@@ -28,7 +34,7 @@
esac
;;
2)
- session="$initlib/xsession -nocalls"
+ session="$default_session -nocalls"
;;
3)
session="xterm -ls -geometry 80x24+280+220 -display :0.0"
Added: trunk/debathena/debathena/dotfiles/xsession.bash
