[24253] in Source-Commits
/svn/athena r23851 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Jun 15 16:29:36 2009
Date: Mon, 15 Jun 2009 16:29:30 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906152029.n5FKTU6X011895@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-06-15 16:29:30 -0400 (Mon, 15 Jun 2009)
New Revision: 23851
Added:
trunk/debathena/debathena/xsession/debian/00debathena-tcsh-sucks
Modified:
trunk/debathena/debathena/xsession/debian/05debathena-nocalls
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/debathena-xsession.install
trunk/debathena/debathena/xsession/debian/xsession.tcsh
Log:
In xsession:
* Spawn the xterm tailing .xsession-errors in the Xsession.d scripts
instead of in the xsession.tcsh script.
* When enabling NOCALLS mode, actually check for the right session name
in the Xsession.d scripts.
Added: trunk/debathena/debathena/xsession/debian/00debathena-tcsh-sucks
===================================================================
--- trunk/debathena/debathena/xsession/debian/00debathena-tcsh-sucks 2009-06-15 03:14:15 UTC (rev 23850)
+++ trunk/debathena/debathena/xsession/debian/00debathena-tcsh-sucks 2009-06-15 20:29:30 UTC (rev 23851)
@@ -0,0 +1,8 @@
+# This file is sourced by Xsession(5), not executed.
+
+# Horrible work-around for the fact that GDM can't read the
+# .xsession-errors file it tries to write.
+if echo "$SHELL" | grep -q 'tcsh' && [ 'afs' = "$DEBATHENA_HOME_TYPE" ]; then
+ xterm -rightbar -sb -fn 9x18 -T ".xsession-errors" -e tail -n +1 -f "$HOME/.xsession-errors" &
+ export XCONSOLE=$!
+fi
Modified: trunk/debathena/debathena/xsession/debian/05debathena-nocalls
===================================================================
--- trunk/debathena/debathena/xsession/debian/05debathena-nocalls 2009-06-15 03:14:15 UTC (rev 23850)
+++ trunk/debathena/debathena/xsession/debian/05debathena-nocalls 2009-06-15 20:29:30 UTC (rev 23851)
@@ -1,4 +1,4 @@
-if [ "$GDMSESSION" = "debathena-nocalls" ]; then
+if [ "$GDMSESSION" = "000debathena-nocalls" ]; then
export NOCALLS=1
message "You have chosen to log in without your customizations." \
"Your dotfiles will be ignored in favor of the system" \
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2009-06-15 03:14:15 UTC (rev 23850)
+++ trunk/debathena/debathena/xsession/debian/changelog 2009-06-15 20:29:30 UTC (rev 23851)
@@ -1,3 +1,12 @@
+debathena-xsession (1.9.2) unstable; urgency=low
+
+ * Spawn the xterm tailing .xsession-errors in the Xsession.d scripts
+ instead of in the xsession.tcsh script.
+ * When enabling NOCALLS mode, actually check for the right session name
+ in the Xsession.d scripts.
+
+ -- Evan Broder <broder@mit.edu> Mon, 15 Jun 2009 16:05:55 -0400
+
debathena-xsession (1.9.1) unstable; urgency=low
* Give the xconsole code half a chance of working.
Modified: trunk/debathena/debathena/xsession/debian/debathena-xsession.install
===================================================================
--- trunk/debathena/debathena/xsession/debian/debathena-xsession.install 2009-06-15 03:14:15 UTC (rev 23850)
+++ trunk/debathena/debathena/xsession/debian/debathena-xsession.install 2009-06-15 20:29:30 UTC (rev 23851)
@@ -1,4 +1,5 @@
debian/000debathena-nocalls.desktop usr/share/xsessions
+debian/00debathena-tcsh-sucks etc/X11/Xsession.d
debian/05debathena-nocalls etc/X11/Xsession.d
debian/96debathena-tracker etc/X11/Xsession.d
debian/97debathena-homedir-mode etc/X11/Xsession.d
Modified: trunk/debathena/debathena/xsession/debian/xsession.tcsh
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-06-15 03:14:15 UTC (rev 23850)
+++ trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-06-15 20:29:30 UTC (rev 23851)
@@ -6,13 +6,6 @@
# 3. Run standard startup programs if the user has not opted out.
# 4. Run the user's .startup.X.
-# Horrible work-around for the fact that GDM can't read the
-# .xsession-errors file it tries to write.
-if ( "$DEBATHENA_HOME_TYPE" == "afs" ) then
- xterm -rightbar -sb -fn 9x18 -T ".xsession-errors" -e tail -n +1 -f "$HOME/.xsession-errors" &
- set XCONSOLE=$!
-endif
-
set initdir=/usr/lib/init
setenv XSESSION $$
@@ -54,8 +47,9 @@
# If we got this far, then there were no errors that the user /really/
# needed to see, so get rid of the ugly xterm
-if ( "$DEBATHENA_HOME_TYPE" == "afs" ) then
+if ( "$DEBATHENA_HOME_TYPE" == "afs" && $?XCONSOLE ) then
kill $XCONSOLE
+ unsetenv XCONSOLE
endif
# Proceed with the session command, which has been passed as arguments.
