[23252] in Source-Commits
/svn/athena r22913 - in trunk/debathena/debathena/dotfiles: . debian gnome
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Mon Apr 21 16:16:14 2008
Date: Mon, 21 Apr 2008 16:15:37 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804212015.QAA15498@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-21 16:15:34 -0400 (Mon, 21 Apr 2008)
New Revision: 22913
Removed:
trunk/debathena/debathena/dotfiles/debian/patches/
trunk/debathena/debathena/dotfiles/mksessiondir.sh
Modified:
trunk/debathena/debathena/dotfiles/Makefile
trunk/debathena/debathena/dotfiles/Xsession
trunk/debathena/debathena/dotfiles/bash_login
trunk/debathena/debathena/dotfiles/bashrc
trunk/debathena/debathena/dotfiles/cshrc
trunk/debathena/debathena/dotfiles/debian/changelog
trunk/debathena/debathena/dotfiles/env_remove
trunk/debathena/debathena/dotfiles/env_setup
trunk/debathena/debathena/dotfiles/gnome/Makefile
trunk/debathena/debathena/dotfiles/login
trunk/debathena/debathena/dotfiles/quotawarn.sh
trunk/debathena/debathena/dotfiles/renew.1
trunk/debathena/debathena/dotfiles/xsession
Log:
In dotfiles:
* Merge in quilt patches. These and other changes are summarized below.
* Remove platform-specific code for non-Linux architectures.
* Remove mksessiondirs and other ATHENA_SESSION_TMPDIr code; this is now
handled by pam_mktemp
* Run from.debathena and quota.debathena rather than from/quota in case
debathena-from-config/debathena-quota-config are not installed
* Remove unecessary athena/ from paths, except in prototype files which
should remain unchanged for compatability.
* Remove ancient extend alias from tcsh dotfiles.
* Set ZEPHYR_CLIENT to not run zwgc on dialups; this avoids problems
with zephyr in Debian automatically gaining focus.
* Remove code for handling temporary home directories, since those can't
happen anymore.
* Stop setting XDG_DATA_DIRS; this is now controlled by debathena-desktop-config.
* Stop setting COREDUMPSIZE; this was an IRIX workaround
* Stop setting LD_LIBRARY_PATH to /usr/athena/lib; this breaks building
things when /usr/athena is a symlink.
* Stop setting XUSERFILESEARCHPATH to a directory that doesn't exist.
* Change renew alias to use 'kinit -54' so we no longer require modified
Kerberos.
* Stop setting MANPATH, since we'd be setting it to the default anyway.
* Remove athena_path logic, since athena_path would be PATH.
* Only have one copy of the add alias, now that athena_path is gone.
* Remove add_flags since it is always empty.
* Don't temporarily remove add in cshrc.
* Stop setting CDPATH.
* Stop changing the default prompt for bash; the Debian default is better.
* Stop changing the default prompt for tcsh, but leave the prompt
character change, since there's a lot of documentation that uses it.
* Stop configuring tcsh to not stat /afs/* when tab-completing; fakestat handles this.
* Remove tcsh warning for "bind" alias.
Modified: trunk/debathena/debathena/dotfiles/Makefile
===================================================================
--- trunk/debathena/debathena/dotfiles/Makefile 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/Makefile 2008-04-21 20:15:34 UTC (rev 22913)
@@ -2,9 +2,9 @@
SHELL=/bin/sh
PROTOTYPE=/usr/prototype_user
-PROTOTMP=/usr/athena/lib/prototype_tmpuser
-SYSTEM=/usr/athena/lib/init
-ATHMANDIR=/usr/athena/man
+PROTOTMP=/usr/lib/prototype_tmpuser
+SYSTEM=/usr/lib/init
+ATHMANDIR=/usr/share/man
ATHRETCDIR=/etc/athena
ATHLOGINDIR=${ATHRETCDIR}/login
@@ -41,7 +41,6 @@
install -c -m 0755 gnome-panel-1-to-2 ${DESTDIR}${SYSTEM}
install -c -m 0444 lockers.7 ${DESTDIR}${ATHMANDIR}/man7
install -c -m 0644 login ${DESTDIR}${SYSTEM}
- install -c -m 0755 mksessiondir.sh ${DESTDIR}${SYSTEM}/mksessiondir
install -c -m 0755 quotawarn.sh ${DESTDIR}${SYSTEM}/quotawarn
install -c -m 0644 bashrc ${DESTDIR}${SYSTEM}
install -c -m 0644 bash_login ${DESTDIR}${SYSTEM}
Modified: trunk/debathena/debathena/dotfiles/Xsession
===================================================================
--- trunk/debathena/debathena/dotfiles/Xsession 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/Xsession 2008-04-21 20:15:34 UTC (rev 22913)
@@ -6,7 +6,7 @@
trap "kdestroy; unlog; fsid -u -f $USER; exit 0" 1 2 15
-initlib="/usr/athena/lib/init"
+initlib="/usr/lib/init"
defsession=$1
defsessioncmd="$2"
@@ -48,23 +48,15 @@
# Make random Athena modifications to keymap if required.
-test -f /usr/athena/lib/X11/keymaps/AthenaMods && \
- xmodmap /usr/athena/lib/X11/keymaps/AthenaMods
+test -f /usr/lib/X11/keymaps/AthenaMods && \
+ xmodmap /usr/lib/X11/keymaps/AthenaMods
# Set X screensaver to noblanking to avoid power saving.
xset s noblank
-# Create a unique temporary directory for the session, and remember
-# the directory name in the environment.
-sessiondir="`$initlib/mksessiondir -s $$`"
-if [ -n "$sessiondir" ]; then
- ATHENA_SESSION_TMPDIR="$sessiondir"
- export ATHENA_SESSION_TMPDIR
-fi
-
# Only attempt using bugme if packs are actually available.
-if [ -x /usr/athena/bin/bugme ]; then
- /usr/athena/bin/bugme $session
+if [ -x /usr/bin/bugme ]; then
+ /usr/bin/bugme $session
else
$session
fi
Modified: trunk/debathena/debathena/dotfiles/bash_login
===================================================================
--- trunk/debathena/debathena/dotfiles/bash_login 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/bash_login 2008-04-21 20:15:34 UTC (rev 22913)
@@ -8,35 +8,18 @@
# explicitly.
. ~/.bashrc
-# SGI xwsh runs shells as login shells. We don't want this.
-if [ "${XSESSION+set}" = set ]; then
- exit 0
-fi
+initdir=/usr/lib/init
-initdir=/usr/athena/lib/init
-
# Remember the pid of the login shell; used by dustbuster.
ATHENA_LOGIN_SESSION=$$
export ATHENA_LOGIN_SESSION
-# Create a unique temporary directory for the session, and remember
-# the directory name in the environment.
-sessiondir="`$initdir/mksessiondir -s $$`"
-if [ -n "$sessiondir" ]; then
- ATHENA_SESSION_TMPDIR="$sessiondir"
- export ATHENA_SESSION_TMPDIR
-fi
-
if [ ! -r ~/.hushlogin ]; then
verbose_login=t # Echo messages unless user has ~/.hushlogin.
fi
/bin/stty sane # Use sane control characters
-if [ sgi = "$HOSTTYPE" ]; then
- /bin/stty intr ^C
-fi
-
# ******************* ENVIRONMENT SETUP *******************
# The ~/.bashrc file sets environment variables, attaches lockers, and sets
@@ -44,39 +27,8 @@
# Check that user home directory is available
-if [ "${TMPHOME+set}" = set ]; then
- echo "WARNING:"
- echo ""
- echo "Your home directory is currently unavailable."
- echo "This is probably due to a problem with the"
- echo "fileserver on which your directory is stored."
- echo ""
- echo "You may use a temporary directory for this session."
- echo "If you do, any files you create and any mail you"
- echo "incorporate will be DELETED when you logout and lost forever."
- echo ""
- echo "Would you like to continue this session, using a TEMPORARY"
- echo -n "directory? (yes,no) [The default is no] "
- read answer
- case $answer in
- [yY]*)
- echo "Continuing with temporary directory..."
- mkdir ~/Mail
- ;;
- *)
- kill -HUP $$
- ;;
- esac
-fi
-
-
# ******************* DEVICE SETUP *******************
-# On IRIX, the terminal type may not be set yet.
-if [ "${TERM+set}" != set ]; then
- eval `tset -s -Q`
-fi
-
# Set device type if interactive session (e.g., dialup)
case $TERM in
@@ -101,7 +53,11 @@
if [ "${ZEPHYR_CLIENT+set}" != set ]; then
export ZEPHYR_CLIENT
- ZEPHYR_CLIENT=zwgc
+ if [ ! -f /etc/athena/dialuptype ]; then
+ ZEPHYR_CLIENT=zwgc
+ else
+ ZEPHYR_CLIENT='echo This is a dialup, so zwgc is not being run on login.'
+ fi
fi
if [ "${skip_tty_startup+set}" != set ]; then
@@ -112,7 +68,7 @@
$ZEPHYR_CLIENT # Start Zephyr client
get_message -new -login # Display current motd
mailquota -n # Check quota on post office server
- from -t -n # Check for mail
+ from.debathena -t -n # Check for mail
fi
Modified: trunk/debathena/debathena/dotfiles/bashrc
===================================================================
--- trunk/debathena/debathena/dotfiles/bashrc 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/bashrc 2008-04-21 20:15:34 UTC (rev 22913)
@@ -4,10 +4,13 @@
# This file is sourced by default user file ~/.bashrc
-initdir=/usr/athena/lib/init
+initdir=/usr/lib/init
+# add alias moved here to avoid having two copies of it.
+add () { eval "$( /bin/attach -Padd -b "$@" )" ; }
+
# ******************* ENVIRONMENT SETUP *******************
@@ -26,7 +29,7 @@
if [ "${ENV_SET:+set}" != set -a "${SHELL##*/}" = bash ]; then
export ENV_SET=t # Avoid unnecessary repeat
- export HOSTTYPE="`/bin/athena/machtype`"
+ export HOSTTYPE="`/bin/machtype`"
umask 077 # Strictly protect files
# (does not apply in AFS)
@@ -35,74 +38,11 @@
export VISUAL=emacs # Set default screen editor
export MM_CHARSET=iso-8859-1
- # Set standard Athena path variables (generic path for all users).
- # PATH will get set later after .bash_environment is run.
- case "$HOSTTYPE" in
- sgi)
- athena_path=/usr/athena/bin:/usr/athena/etc:
- athena_path=$athena_path:/bin/athena:/usr/sbin:/usr/bsd:/sbin
- athena_path=$athena_path:/usr/bin:/bin:/usr/bin/X11:/usr/etc
- MANPATH=/usr/athena/man:/usr/freeware/catman:/usr/share/catman
- MANPATH=$MANPATH:/usr/share/man:/usr/catman:/usr/man
- ;;
- sun4)
- athena_path=/srvd/patch:/usr/athena/bin:/usr/athena/etc
- athena_path=$athena_path:/bin/athena:/usr/openwin/bin
- athena_path=$athena_path:/usr/openwin/demo:/usr/dt/bin:/usr/bin
- athena_path=$athena_path:/usr/ccs/bin:/usr/sbin:/sbin
- athena_path=$athena_path:/usr/sfw/bin:/usr/ucb
- MANPATH=/usr/athena/man:/usr/openwin/man:/usr/dt/man:/usr/man
- MANPATH=$MANPATH:/usr/sfw/man
- ;;
- linux)
- athena_path=/usr/athena/bin:/usr/athena/etc
- athena_path=$athena_path:/bin/athena:/usr/bin:/bin
- athena_path=$athena_path:/usr/X11R6/bin:/usr/athena/etc
- athena_path=$athena_path:/usr/sbin:/sbin
- MANPATH=/usr/athena/man:/usr/share/man:/usr/X11R6/man
- ;;
- *)
- echo "Standard dotfiles do not support system type $HOSTTYPE."
- esac
- export MANPATH
+ export MORE=-s
- # Default "more" behavior
- case $HOSTTYPE in
- sgi)
- MORE=-se
- ;;
- *)
- MORE=-s
- ;;
- esac
- export MORE
+ export ATHENA_SYS=`/bin/machtype -S`
+ export ATHENA_SYS_COMPAT=`/bin/machtype -C`
- # Set miscellaneous system-dependent variables.
- case $HOSTTYPE in
- sgi)
- # The following set the default error message format
- # to omit the label and severity components, per the
- # standard IRIX /etc/profile.
- export MSGVERB=text:action
- export NOMSGLABEL=1
- export NOMSGSEVERITY=1
- ;;
- sun4)
- export OPENWINHOME=/usr/openwin
- ;;
- linux)
- # This is to ensure that native programs use the Athena
- # gconf, ORBit, bonobo-activation, etc. libraries
- # rather than the native ones. GNOME programs outside
- # of /usr/athena/bin may not function properly if it is
- # not set.
- export LD_LIBRARY_PATH=/usr/athena/lib
- ;;
- esac
-
- export ATHENA_SYS=`/bin/athena/machtype -S`
- export ATHENA_SYS_COMPAT=`/bin/athena/machtype -C`
-
if [ -z "$ATHENA_SYS" ]; then
export ATHENA_SYS=@sys
fi
@@ -112,8 +52,6 @@
if [ -n "$PRINTER" ]; then export PRINTER; fi
fi
- export XDG_DATA_DIRS=/usr/athena/share:/usr/share
-
# Reset the HOME variable to correspond to the actual location
# of the user's home directory. This will avoid having long
# pathnames being printed when /mit/<user> is a symlink to a
@@ -128,12 +66,6 @@
fi
unset x
- # Special version of ADD for the .bash_environment file.
-
- add () {
- eval "$( /bin/athena/attach -Padd -b -P"$athena_path" "$@" )"
- }
-
# Run user environment customizations identified in your
# ~/.bash_environment file. This is the place to include your
# own environment variables, attach commands, and other system
@@ -146,61 +78,23 @@
if [ "${NOCALLS+set}" != set -a -r ~/.bash_environment ]; then
. ~/.bash_environment
fi
-
- # On IRIX, limits are reset on exec of a setuid program, e.g.
- # xterm. So record now what the user wanted coredumpsize to
- # be so we can fix it later.
- export COREDUMPSIZE_LIMIT=`ulimit -c`
# Standard Athena path
- athena_home_bin=$( /usr/athena/bin/athdir "$HOME" )
- PATH=${athena_home_bin:+$athena_home_bin:}$athena_path:.
- unset athena_path athena_home_bin
+ athena_home_bin=$( /usr/bin/athdir "$HOME" )
+ PATH=${athena_home_bin:+$athena_home_bin:}$PATH:.
+ unset athena_home_bin
- # Make sure applications can properly find their appdefs, etc.
-
- if [ "${XUSERFILESEARCHPATH+set}" != set ]; then
- XUSERFILESEARCHPATH=/usr/athena/lib/X11/app-defaults/%N
- else
- XUSERFILESEARCHPATH=$XUSERFILESEARCHPATH:/usr/athena/lib/X11/app-defaults/%N
- fi
-
- if [ sgi = "$HOSTTYPE" -a "${skip_sgi+set}" != set -a "${NOCALLS+set}" != set ]; then
- XUSERFILESEARCHPATH="$HOME/.desktop-$host/%N:$HOME/.desktop-$host/0.0/%N:$XUSERFILESEARCHPATH"
- fi
-
- export XUSERFILESEARCHPATH
-
fi
-
+
# ******************* BASH SETUP *******************
# Set up standard bash shell initializations
set -o noclobber # Don't overwrite files with redirection
-if [ "${PS1+set}" = set ]; then
- if [ sgi = "$HOSTTYPE" -a -t 0 ]; then
- # Have no better way to do this at the moment.
- stty sane intr ^C
- fi
- case $HOME in
- /var/athena/tmphomedir/*)
- PS1="athena (temporary homedir)\$ "
- ;;
- *)
- PS1="athena\$ "
- ;;
- esac
- CDPATH=.:~
-fi
-
-# Fix coredumpsize limit in case it was reset
-[ -n "$COREDUMPSIZE_LIMIT" ] && ulimit -S -c $COREDUMPSIZE_LIMIT
-
# alias for re-establishing authentication
-renew () { kinit $USER && fsid -a && zctl load /dev/null ; }
+renew () { kinit -54 $USER && fsid -a && zctl load /dev/null ; }
# alias for a convenient way to change terminal type
term () { set -f; unset TERMCAP; eval "$( tset -s -I -Q "$@" )"; set +f; }
@@ -218,9 +112,6 @@
# aliases dealing with adding locker programs
-add_flags=
-add () { eval "$( /bin/athena/attach -Padd -b $add_flags "$@" )" ; }
-
alias setup='echo "setup is not supported in bash yet"'
Modified: trunk/debathena/debathena/dotfiles/cshrc
===================================================================
--- trunk/debathena/debathena/dotfiles/cshrc 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/cshrc 2008-04-21 20:15:34 UTC (rev 22913)
@@ -5,7 +5,7 @@
# This file is sourced by default user file ~/.cshrc
-set initdir=/usr/athena/lib/init
+set initdir=/usr/lib/init
# ******************* ENVIRONMENT SETUP *******************
@@ -16,35 +16,17 @@
bindkey "^Z" complete-word
bindkey " " magic-space
- if ($tcsh:r:e > 7 || $tcsh:r:r > 6) then
- alias bind 'echo The \"bind\" command is no longer supported in tcsh 6.08. Use the; echo \"bindkey\" command instead. See the tcsh man page for more information.; ( echo \!* > /dev/null )'
- endif
endif
# Set host type and hostname variables.
-if (! $?ATHENA_HOSTTYPE) setenv ATHENA_HOSTTYPE "`/bin/athena/machtype`"
+if (! $?ATHENA_HOSTTYPE) setenv ATHENA_HOSTTYPE "`/bin/machtype`"
if (! $?HOST) setenv HOST "`hostname`"
setenv HOSTTYPE "$ATHENA_HOSTTYPE"
set hosttype=$HOSTTYPE
set host=$HOST
-switch ("$HOSTTYPE")
-case sun4:
- set athena_path=( /srvd/patch /usr/athena/bin /usr/athena/etc /bin/athena \
- /usr/openwin/bin /usr/openwin/demo /usr/dt/bin /usr/bin \
- /usr/ccs/bin /usr/sbin /sbin /usr/sfw/bin /usr/ucb )
- set athena_manpath=/usr/athena/man:/usr/openwin/man:/usr/dt/man:/usr/man
- set athena_manpath=${athena_manpath}:/usr/sfw/man
- breaksw
-case linux:
- set athena_path=( /usr/athena/bin /usr/athena/etc /bin/athena /usr/bin \
- /bin /usr/X11R6/bin /usr/sbin /sbin )
- set athena_manpath=/usr/athena/man:/usr/share/man:/usr/X11R6/man
- breaksw
-default:
- echo "Standard dotfiles do not support system type $HOSTTYPE."
- breaksw
-endsw
+# add alias for attaching lockers
+alias add 'eval `/bin/attach -Padd \!:*`'
# Set up standard system/user environment configuration (including setup of
# environment variables, attachment of lockers, and setting of search path)
@@ -66,27 +48,11 @@
# Set standard Athena path variables. Actual $path (and thus $PATH)
# are set later, after ~/.environment is sourced.
- setenv MANPATH "$athena_manpath"
-
- # Set other miscellaneous OS-specific environment variables
- switch ("$HOSTTYPE")
- case sun4:
- setenv OPENWINHOME /usr/openwin
- breaksw
- case linux:
- # This is to ensure that native programs use the Athena gconf, ORBit,
- # bonobo-activation, etc. libraries rather than the native ones.
- # GNOME programs outside of /usr/athena/bin may not function properly
- # if it is not set.
- setenv LD_LIBRARY_PATH /usr/athena/lib
- breaksw
- endsw
-
- setenv ATHENA_SYS `/bin/athena/machtype -S`
+ setenv ATHENA_SYS `/bin/machtype -S`
if ( $ATHENA_SYS == "" ) then
setenv ATHENA_SYS @sys
endif
- setenv ATHENA_SYS_COMPAT `/bin/athena/machtype -C`
+ setenv ATHENA_SYS_COMPAT `/bin/machtype -C`
set bindir=arch/${ATHENA_SYS}/bin
@@ -95,8 +61,6 @@
if ( $PRINTER == "" ) unsetenv PRINTER
endif
- setenv XDG_DATA_DIRS /usr/athena/share:/usr/share
-
# Reset the "home" and HOME variables to correspond to the actual
# location of the user's home directory. This will avoid having
# long pathnames being printed when /mit/<user> is a symlink to a
@@ -119,28 +83,6 @@
endif
unset x
- # Special version of add alias that will work in your ~/.environment
- # file. This is replaced further down with the version that works
- # when you are logged in.
-
- # This "extend" alias and friends have been left in for backwards
- # compatibility with old .environment files, just in case. The new
- # add alias does not use them.
- alias extend 'if (-d \!:2) if ("$\!:1" \!~ *"\!:2"*) set extendyes && \\
- if ($?extendyes && $?verboseadd) echo \!:2 added to end of \$\!:1 && \\
- if ($?extendyes) setenv \!:1 ${\!:1}:\!:2 && \\
- unset extendyes'
- alias sextend 'if (-d \!:2) if ("$\!:1" \!~ *"\!:2"*) set extendyes && \\
- if ($?extendyes && $?verboseadd) echo \!:2 added to end of \$\!:1 && \\
- if ($?extendyes) set \!:1=(${\!:1} \!:2) && \\
- unset extendyes'
- alias textend 'if (-d \!:2) if ("$\!:1" \!~ *"\!:2"*) set extendyes && \\
- if ($?extendyes && $?verboseadd) echo \!:2 added to end of \$\!:1 && \\
- if ($?extendyes) set \!:1=${\!:1}:\!:2 && \\
- unset extendyes'
-
- alias add 'eval `/bin/athena/attach -Padd -P "$athena_path" \!:*`'
-
# Run user environment customizations identified in your
# ~/.environment file. This is the place to include your own
# environment variables, attach commands, and other system wide
@@ -150,15 +92,7 @@
# customizations" option when you logged in).
if ((! $?NOCALLS) && (-r ~/.environment)) source ~/.environment
-
- # remove temporary version of add
- unalias extend sextend textend add
- alias add 'echo Use add in your ~/.environment, not your ~/.path.'
- # Reset athena_manpath in case .path uses it (.path should just use
- # $MANPATH, but using $athena_manpath has worked historically).
- set athena_manpath=$MANPATH
-
# Set up default search path, if not yet set. Use your ~/.path file
# to provide an alternative path -- this file should be of the form
# "set path=...", and can refer to the shell variable $athena_path,
@@ -172,16 +106,9 @@
source ~/.path
else
# Standard Athena path
- set path=(`/usr/athena/bin/athdir $HOME` $athena_path .)
+ set path=(`/usr/bin/athdir $HOME` $PATH .)
endif
- # Make sure applications can properly find their appdefs, etc.
-
- if (! $?XUSERFILESEARCHPATH) then
- setenv XUSERFILESEARCHPATH "/usr/athena/lib/X11/app-defaults/%N"
- else
- setenv XUSERFILESEARCHPATH "${XUSERFILESEARCHPATH}:/usr/athena/lib/X11/app-defaults/%N"
- endif
endif
# Set appropriate bin directory variable for this platform
@@ -198,21 +125,13 @@
if ($?prompt) then # For interactive shells only (i.e., NOT rsh):
# Set prompt.
set promptchars="%#"
- if ($home =~ /var/athena/tmphomedir/*) then
- set prompt = "athena (temporary homedir)%# "
- else
- set prompt = "athena%# "
- endif
-
- set cdpath = (~) # Path to search for directory changes
set interactive # Provide shell variable for compatability
- set nostat = (/afs/) # Don't stat when completing in /afs
endif
# Set up standard C shell aliases
# alias for re-establishing authentication
-alias renew 'kinit $USER && fsid -a && zctl load /dev/null'
+alias renew 'kinit -54 $USER && fsid -a && zctl load /dev/null'
# alias for a convenient way to change terminal type
alias term 'set noglob; unsetenv TERMCAP; eval `tset -s -I -Q \!*`'
@@ -228,16 +147,6 @@
endif
endif
-# aliases dealing with adding locker programs
-# extend remains for other software; add no longer uses the extend alias
-alias extend 'if (-d \!:2) if ("$\!:1" \!~ *"\!:2"*) set extendyes && \\
- if ($?extendyes && $?verboseadd) echo \!:2 added to end of \$\!:1 && \\
- if ($?extendyes) setenv \!:1 ${\!:1}:\!:2 && \\
- unset extendyes'
-
-set add_flags
-alias add 'eval `/bin/athena/attach -Padd $add_flags \!:*`'
-
# aliases dealing with subjects
alias setup_X '( setenv SUBJECT \!:1 ; ( xterm -title \!* & ) )'
alias setup_tty '( setenv SUBJECT \!* ; $SHELL )'
Modified: trunk/debathena/debathena/dotfiles/debian/changelog
===================================================================
--- trunk/debathena/debathena/dotfiles/debian/changelog 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/debian/changelog 2008-04-21 20:15:34 UTC (rev 22913)
@@ -1,3 +1,39 @@
+debathena-dotfiles (10.0.0-0debathena1) unstable; urgency=low
+
+ * Merge in quilt patches. These and other changes are summarized below.
+ * Remove platform-specific code for non-Linux architectures.
+ * Remove mksessiondirs and other ATHENA_SESSION_TMPDIr code; this is now
+ handled by pam_mktemp
+ * Run from.debathena and quota.debathena rather than from/quota in case
+ debathena-from-config/debathena-quota-config are not installed
+ * Remove unecessary athena/ from paths, except in prototype files which
+ should remain unchanged for compatability.
+ * Remove ancient extend alias from tcsh dotfiles.
+ * Set ZEPHYR_CLIENT to not run zwgc on dialups; this avoids problems
+ with zephyr in Debian automatically gaining focus.
+ * Remove code for handling temporary home directories, since those can't
+ happen anymore.
+ * Stop setting XDG_DATA_DIRS; this is now controlled by debathena-desktop-config.
+ * Stop setting COREDUMPSIZE; this was an IRIX workaround
+ * Stop setting LD_LIBRARY_PATH to /usr/athena/lib; this breaks building
+ things when /usr/athena is a symlink.
+ * Stop setting XUSERFILESEARCHPATH to a directory that doesn't exist.
+ * Change renew alias to use 'kinit -54' so we no longer require modified
+ Kerberos.
+ * Stop setting MANPATH, since we'd be setting it to the default anyway.
+ * Remove athena_path logic, since athena_path would be PATH.
+ * Only have one copy of the add alias, now that athena_path is gone.
+ * Remove add_flags since it is always empty.
+ * Don't temporarily remove add in cshrc.
+ * Stop setting CDPATH.
+ * Stop changing the default prompt for bash; the Debian default is better.
+ * Stop changing the default prompt for tcsh, but leave the prompt
+ character change, since there's a lot of documentation that uses it.
+ * Stop configuring tcsh to not stat /afs/* when tab-completing; fakestat handles this.
+ * Remove tcsh warning for "bind" alias.
+
+ -- Tim Abbott <tabbott@mit.edu> Mon, 21 Apr 2008 16:06:04 -0400
+
debathena-dotfiles (9.4.43-0debathena2) unstable; urgency=low
* Don't create ATHENA_SESSION_TMPDIR, since it is now managed by PAM
Modified: trunk/debathena/debathena/dotfiles/env_remove
===================================================================
--- trunk/debathena/debathena/dotfiles/env_remove 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/env_remove 2008-04-21 20:15:34 UTC (rev 22913)
@@ -4,7 +4,7 @@
if ($?setup_dir && $?setup_filsys) then
if (-r $setup_dir/.detachrc) source $setup_dir/.detachrc
cd / # get out of locker
- /bin/athena/detach $setup_filsys
+ /bin/detach $setup_filsys
kill -HUP $$ # cause shell to exit
endif
Modified: trunk/debathena/debathena/dotfiles/env_setup
===================================================================
--- trunk/debathena/debathena/dotfiles/env_setup 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/env_setup 2008-04-21 20:15:34 UTC (rev 22913)
@@ -8,7 +8,7 @@
unset extendyes'
echo "Attaching $SUBJECT ... "
-set setup_dir = `/bin/athena/attach -p $SUBJECT`
+set setup_dir = `/bin/attach -p $SUBJECT`
if (! $status) then
Modified: trunk/debathena/debathena/dotfiles/gnome/Makefile
===================================================================
--- trunk/debathena/debathena/dotfiles/gnome/Makefile 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/gnome/Makefile 2008-04-21 20:15:34 UTC (rev 22913)
@@ -1,10 +1,10 @@
# $Id: Makefile,v 1.6 2006-08-09 15:42:50 rbasch Exp $
-PIXMAPDIR=/usr/athena/share/pixmaps
-GNOMEATHDIR=/usr/athena/share/gnome/athena
-SCHEMASDIR=/etc/athena/gconf/schemas
+PIXMAPDIR=/usr/share/pixmaps
+GNOMEATHDIR=/usr/share/gnome/athena
+SCHEMASDIR=/usr/share/gconf/schemas
AFSMENUS=/afs/athena.mit.edu/system/config/panel/menus
-APPLICATIONS=/usr/athena/share/applications
+APPLICATIONS=/usr/share/applications
all: athena.schemas
Modified: trunk/debathena/debathena/dotfiles/login
===================================================================
--- trunk/debathena/debathena/dotfiles/login 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/login 2008-04-21 20:15:34 UTC (rev 22913)
@@ -3,69 +3,24 @@
# This file is sourced by default user file ~/.login
-# SGI xwsh runs shells as login shells. We don't want this.
-if ($?XSESSION) then
- exit 0
-endif
-
# Remember the pid of the login shell; used by dustbuster.
setenv ATHENA_LOGIN_SESSION $$
-set initdir=/usr/athena/lib/init
+set initdir=/usr/lib/init
-# Create a unique temporary directory for the session, and remember
-# the directory name in the environment.
-set sessiondir = "`$initdir/mksessiondir -s $$`"
-if ("$sessiondir" != "") then
- setenv ATHENA_SESSION_TMPDIR "$sessiondir"
-endif
-
if (! -r ~/.hushlogin) then
set verbose_login # Echo messages unless user has ~/.hushlogin.
endif
/bin/stty sane # Use sane control characters
-if ($hosttype == "sgi") then
- /bin/stty intr ^C
-endif
-
# ******************* ENVIRONMENT SETUP *******************
# The ~/.cshrc file sets environment variables, attaches lockers, and sets
# the command search path. It has already been sourced at this point.
-# Check that user home directory is available
-if ($?TMPHOME) then
- echo "WARNING:"
- echo ""
- echo "Your home directory is currently unavailable."
- echo "This is probably due to a problem with the"
- echo "fileserver on which your directory is stored."
- echo ""
- echo "You may use a temporary directory for this session."
- echo "If you do, any files you create and any mail you"
- echo "incorporate will be DELETED when you logout and lost forever."
- echo ""
- echo "Would you like to continue this session, using a TEMPORARY"
- echo -n "directory? (yes,no) [The default is no] "
- set answer = ($<)
- if ("$answer" =~ [yY]*) then
- echo "Continuing with temporary directory..."
- mkdir ~/Mail
- else
- kill -HUP $$
- endif
-endif
-
-
# ******************* DEVICE SETUP *******************
-# On IRIX, the terminal type may not be set yet.
-if (! $?term) then
- eval `tset -s -Q`
-endif
-
# Set device type if interactive session (e.g., dialup)
if (("$term" == switch) || ("$term" == network) || ("$term" == dialup) \
@@ -88,7 +43,13 @@
# Run default system startup activities. To skip these, put the command
# "set skip_tty_startup" in your ~/.environment file.
-if (! $?ZEPHYR_CLIENT) setenv ZEPHYR_CLIENT zwgc
+if (! $?ZEPHYR_CLIENT) then
+ if (! -f /etc/athena/dialuptype) then
+ setenv ZEPHYR_CLIENT zwgc
+ else
+ setenv ZEPHYR_CLIENT 'echo This is a dialup, so zwgc is not being run on login.'
+ endif
+endif
if (! $?skip_tty_startup) then
if ($?verbose_login) echo "Running standard startup activities ..."
@@ -96,7 +57,7 @@
$ZEPHYR_CLIENT # Start Zephyr client
get_message -new -login # Display current motd
mailquota -n # Check quota on post office server
- from -t -n # Check for mail
+ from.debathena -t -n # Check for mail
endif
Deleted: trunk/debathena/debathena/dotfiles/mksessiondir.sh
Modified: trunk/debathena/debathena/dotfiles/quotawarn.sh
===================================================================
--- trunk/debathena/debathena/dotfiles/quotawarn.sh 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/quotawarn.sh 2008-04-21 20:15:34 UTC (rev 22913)
@@ -3,7 +3,7 @@
# $Id: quotawarn.sh,v 1.4 2007-04-09 17:13:19 ghudson Exp $
# Determine the user's home directory usage and quota.
-qline=`quota -v -f "$USER" | awk '/^\// {print}'`
+qline=`quota.debathena -v -f "$USER" | awk '/^\// {print}'`
usage=`echo "$qline" | awk '{print $2}'`
quota=`echo "$qline" | awk '{print $3}'`
quota90=`expr "${quota:-0}" \* 9 / 10`
Modified: trunk/debathena/debathena/dotfiles/renew.1
===================================================================
--- trunk/debathena/debathena/dotfiles/renew.1 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/renew.1 2008-04-21 20:15:34 UTC (rev 22913)
@@ -15,7 +15,7 @@
of commands:
.ti 12
-kinit $USER && fsid -a && zctl load /dev/null
+kinit -54 $USER && fsid -a && zctl load /dev/null
"USER" is an environment variable that is set to your username.
\fIkinit\fR prompts you for your password and gets you a new kerberos
Modified: trunk/debathena/debathena/dotfiles/xsession
===================================================================
--- trunk/debathena/debathena/dotfiles/xsession 2008-04-20 05:35:19 UTC (rev 22912)
+++ trunk/debathena/debathena/dotfiles/xsession 2008-04-21 20:15:34 UTC (rev 22913)
@@ -1,4 +1,4 @@
-#!/bin/athena/tcsh -f
+#!/bin/tcsh -f
# Global xsession file
# Accepts one optional argument, either "nocalls" (use no user files)
# or "dash" (use old dash-based interface).
@@ -7,8 +7,8 @@
# Note: This shell script deliberately uses the -f flag.
-set initdir=/usr/athena/lib/init
-set gconftool=/usr/athena/bin/gconftool-2
+set initdir=/usr/lib/init
+set gconftool=/usr/bin/gconftool-2
# Determine whether to use user customizations: use no customization files
# ONLY if the single argument "nocalls" was provided to xsession (e.g., if
@@ -23,7 +23,7 @@
echo -n "xsession: Running standard xsession "
echo "with NO user configuration files..."
setenv NOCALLS
- setenv SHELL /bin/athena/tcsh
+ setenv SHELL /bin/tcsh
else if ($1 == dash) then
echo -n "xsession: Running standard xsession "
echo "with dash-based interface..."
@@ -237,7 +237,7 @@
# the day as windowgram
if (! $?ZEPHYR_CLIENT) setenv ZEPHYR_CLIENT zwgc
if ($?NOCALLS) then
- zwgc -f /usr/athena/share/zephyr/zwgc.desc -subfile /dev/null && \
+ zwgc -f /etc/zephyr/zwgc.desc -subfile /dev/null && \
get_message -new -zephyr
else
$ZEPHYR_CLIENT && get_message -new -zephyr
@@ -245,7 +245,7 @@
if (! $?skip_quotawarn) then
($initdir/quotawarn &) # Display warning dialogs if near quota
endif
- from -t -n # Check for mail
+ from.debathena -t -n # Check for mail
if (! $?skip_xss) then
(xscreensaver -no-splash &)
endif
