[24254] in Source-Commits
/svn/athena r23852 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Jun 15 17:02:55 2009
X-Barracuda-Envelope-From: broder@mit.edu
Date: Mon, 15 Jun 2009 17:02:21 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906152102.n5FL2LdH014406@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 17:02:20 -0400 (Mon, 15 Jun 2009)
New Revision: 23852
Modified:
trunk/debathena/debathena/xsession/debian/05debathena-nocalls
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/xsession.bash
trunk/debathena/debathena/xsession/debian/xsession.tcsh
Log:
In xsession:
* Don't let people set debathena-nocalls as their default session.
* Don't source .startup.X if NOCALLS is set.
Modified: trunk/debathena/debathena/xsession/debian/05debathena-nocalls
===================================================================
--- trunk/debathena/debathena/xsession/debian/05debathena-nocalls 2009-06-15 20:29:30 UTC (rev 23851)
+++ trunk/debathena/debathena/xsession/debian/05debathena-nocalls 2009-06-15 21:02:20 UTC (rev 23852)
@@ -1,7 +1,10 @@
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" \
- "default settings. You can use this session to fix any" \
- "problems with your dotfiles."
+ export NOCALLS=1
+ message "You have chosen to log in without your customizations." \
+ "Your dotfiles will be ignored in favor of the system" \
+ "default settings. You can use this session to fix any" \
+ "problems with your dotfiles."
+
+ # You don't actually want nocalls as your default session
+ [ -e "$HOME/.dmrc" ] && rm "$HOME/.dmrc"
fi
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2009-06-15 20:29:30 UTC (rev 23851)
+++ trunk/debathena/debathena/xsession/debian/changelog 2009-06-15 21:02:20 UTC (rev 23852)
@@ -1,3 +1,10 @@
+debathena-xsession (1.9.3) unstable; urgency=low
+
+ * Don't let people set debathena-nocalls as their default session.
+ * Don't source .startup.X if NOCALLS is set.
+
+ -- Evan Broder <broder@mit.edu> Mon, 15 Jun 2009 17:01:15 -0400
+
debathena-xsession (1.9.2) unstable; urgency=low
* Spawn the xterm tailing .xsession-errors in the Xsession.d scripts
Modified: trunk/debathena/debathena/xsession/debian/xsession.bash
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.bash 2009-06-15 20:29:30 UTC (rev 23851)
+++ trunk/debathena/debathena/xsession/debian/xsession.bash 2009-06-15 21:02:20 UTC (rev 23852)
@@ -46,7 +46,7 @@
($initdir/displaylert &)
fi
-if [ -r "$HOME/.startup.X" ]; then
+if [ -r "$HOME/.startup.X" ] && [ "${NOCALLS+set}" != set ]; then
( . "$HOME/.startup.X" &)
fi
Modified: trunk/debathena/debathena/xsession/debian/xsession.tcsh
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-06-15 20:29:30 UTC (rev 23851)
+++ trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-06-15 21:02:20 UTC (rev 23852)
@@ -41,7 +41,7 @@
($initdir/displaylert &)
endif
-if (-r ~/.startup.X) then
+if (-r ~/.startup.X && (! $?NOCALLS)) then
(source ~/.startup.X &)
endif
