[2735] in Release_Engineering
more global xsession changes
daemon@ATHENA.MIT.EDU (vanharen@ATHENA.MIT.EDU)
Wed Aug 7 23:28:37 1991
From: vanharen@ATHENA.MIT.EDU
Date: Wed, 7 Aug 91 23:28:52 -0400
To: rel-eng@ATHENA.MIT.EDU
Patch to implement dash ignoring customizations (~/.dashrc) if NOCALLS
set... These diffs are on top of what I sent before, so the line
numbers reflect that.
Also, note change in use of "dash -athena" to "dash -default", since
"default" contains "athena" the "user" defined set, and this is still
correct if NOCALLS is set, since the
/usr/athena/lib/X11/app-defaults/Dash file defines the userTree ("user"
set) to be empty. If you didn't follow all that, trust me, it's
right... :-)
-C.
*** /tmp/xsession Wed Aug 7 22:32:54 1991
--- /tmp/xsession.new Wed Aug 7 23:22:36 1991
***************
*** 133,143 ****
if (! $?skip_xlogout) then
if ($?verbose_login) echo "Starting the Athena Dashboard..."
if ($?verbose_login) echo "Creating logout button..."
! (dash -athena -logout &)
sleep $sleep_time
else
if ($?verbose_login) echo "Starting the Athena Dashboard..."
! (dash -athena &)
sleep $sleep_time
endif
else
--- 133,148 ----
if (! $?skip_xlogout) then
if ($?verbose_login) echo "Starting the Athena Dashboard..."
if ($?verbose_login) echo "Creating logout button..."
! if ($?NOCALLS) then
! (dash -default -logout \
! -userdefs /usr/athena/lib/X11/app-defaults/Dash &)
! else
! (dash -default -logout &)
! endif
sleep $sleep_time
else
if ($?verbose_login) echo "Starting the Athena Dashboard..."
! (dash &)
sleep $sleep_time
endif
else
