[24255] in Source-Commits
/svn/athena r23853 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (Evan Broder)
Mon Jun 15 17:07:15 2009
Date: Mon, 15 Jun 2009 17:07:06 -0400
From: Evan Broder <broder@MIT.EDU>
Message-Id: <200906152107.n5FL76SF014837@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:07:06 -0400 (Mon, 15 Jun 2009)
New Revision: 23853
Modified:
trunk/debathena/debathena/xsession/debian/05debathena-nocalls
trunk/debathena/debathena/xsession/debian/xsession.tcsh
Log:
Only delete the .dmrc file if it's set to our nocalls session.
Also add some extra parentheses to xsession.tcsh, just in case they're
needed.
Modified: trunk/debathena/debathena/xsession/debian/05debathena-nocalls
===================================================================
--- trunk/debathena/debathena/xsession/debian/05debathena-nocalls 2009-06-15 21:02:20 UTC (rev 23852)
+++ trunk/debathena/debathena/xsession/debian/05debathena-nocalls 2009-06-15 21:07:06 UTC (rev 23853)
@@ -4,7 +4,7 @@
"Your dotfiles will be ignored in favor of the system" \
"default settings. You can use this session to fix any" \
"problems with your dotfiles."
+fi
- # You don't actually want nocalls as your default session
- [ -e "$HOME/.dmrc" ] && rm "$HOME/.dmrc"
-fi
+# You don't actually want nocalls as your default session
+[ -e "$HOME/.dmrc" ] && grep -q 000debathena-nocalls "$HOME/.dmrc" && rm "$HOME/.dmrc"
Modified: trunk/debathena/debathena/xsession/debian/xsession.tcsh
===================================================================
--- trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-06-15 21:02:20 UTC (rev 23852)
+++ trunk/debathena/debathena/xsession/debian/xsession.tcsh 2009-06-15 21:07:06 UTC (rev 23853)
@@ -41,7 +41,7 @@
($initdir/displaylert &)
endif
-if (-r ~/.startup.X && (! $?NOCALLS)) then
+if ((-r ~/.startup.X) && (! $?NOCALLS)) then
(source ~/.startup.X &)
endif
