|
From: Will P. <pa...@us...> - 2006-05-17 10:07:36
|
Update of /cvsroot/ark/sidai/user-setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12254/user-setup Modified Files: bash.profile common.sh dot.emacs sh.start-shell zsh.login Log Message: updates Index: bash.profile =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/bash.profile,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** bash.profile 26 May 2004 18:40:49 -0000 1.8 --- bash.profile 17 May 2006 10:06:57 -0000 1.9 *************** *** 59,65 **** if [ -f ~/.bashrc ]; then . ~/.bashrc; fi - # mesg is basically useless these days: - mesg n - # ======================================================================== # run the generic script and produce sh shell output --- 59,62 ---- Index: common.sh =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/common.sh,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -r1.16 -r1.17 *** common.sh 7 Feb 2006 11:40:22 -0000 1.16 --- common.sh 17 May 2006 10:06:57 -0000 1.17 *************** *** 203,206 **** --- 203,210 ---- login_term=CDE_console + elif [ "x$GDMSESSION" != 'x' ] ; then + login_from=Linux # really GNOME + login_term=Linux_WM + elif [ "x$TERM" != 'x' -a "x$TERM" = xlinux -a "$IN_XINITRC" = 1 ] ; then login_from=Linux *************** *** 208,212 **** else # not in CDE or linux-console land - mesg n # Stop naughty users writing on your terminal # if it says vt100 at this point (e.g. coming in from cainam), --- 212,215 ---- *************** *** 298,301 **** --- 301,307 ---- ;; + Linux_WM) + ;; + Linux_console) ;; *************** *** 371,374 **** --- 377,383 ---- : i.e. doing the X startup thing... + elif [ $login_term = 'Linux_WM' ] ; then + : i.e. doing the X startup thing... + elif [ $login_term = 'Linux_console' -a "$IN_XINITRC" = '1' ] ; then : i.e. doing the X startup thing... Index: dot.emacs =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/dot.emacs,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** dot.emacs 4 Mar 2005 14:50:31 -0000 1.7 --- dot.emacs 17 May 2006 10:06:57 -0000 1.8 *************** *** 1,4 **** --- 1,5 ---- ;; general .emacs stuff; ;; assumes XEmacs 21, probably shouldn't + (message "am here") ; ;; we're not wimps -- we can handle 'em... Index: sh.start-shell =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/sh.start-shell,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** sh.start-shell 26 May 2004 18:40:49 -0000 1.8 --- sh.start-shell 17 May 2006 10:06:57 -0000 1.9 *************** *** 40,44 **** #echo reading sidai sh.start-shell ! if [ -z "${DT:-}" -a "x$SHELL_AS_WAS" != "x$SHELL" ] ; then # this will be true when we exec: SHELL_AS_WAS="$SHELL"; export SHELL_AS_WAS --- 40,44 ---- #echo reading sidai sh.start-shell ! if [ -z "${DT:-}" -a -z "${GDMSESSION:-}" -a "x$SHELL_AS_WAS" != "x$SHELL" ] ; then # this will be true when we exec: SHELL_AS_WAS="$SHELL"; export SHELL_AS_WAS Index: zsh.login =================================================================== RCS file: /cvsroot/ark/sidai/user-setup/zsh.login,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -r1.7 -r1.8 *** zsh.login 26 May 2004 18:40:49 -0000 1.7 --- zsh.login 17 May 2006 10:06:57 -0000 1.8 *************** *** 58,64 **** if [ -f ~/.zshrc ]; then . ~/.zshrc; fi - # mesg is basically useless these days: - mesg n - # ======================================================================== # run the generic script and produce sh shell output --- 58,61 ---- |