CVS: sidai/user-setup common.paths, 1.8, 1.9 common.sh, 1.17, 1.18 csh.start-shell, 1.2, 1.3 sh.start-shell, 1.9, 1.10

[Will P. <pa...@us...>]

Update of /cvsroot/ark/sidai/user-setup
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv7182/user-setup

Modified Files:
	common.paths common.sh csh.start-shell sh.start-shell 
Log Message:
misc. updates

Index: common.paths
===================================================================
RCS file: /cvsroot/ark/sidai/user-setup/common.paths,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** common.paths	30 Jul 2005 12:35:33 -0000	1.8
--- common.paths	12 Mar 2007 10:53:42 -0000	1.9
***************
*** 50,53 ****
--- 50,58 ----
  fi
  
+ # /etc/profile.d/*sh may accumulate interesting things in PATH,
+ # so we can't just toss all that
+ path_as_was=$PATH
+ manpath_as_was=$MANPATH
+ 
  PATH=$HOME/pub/share/bin:$HOME/bin
  PATH=$PATH:/our/bin
***************
*** 57,61 ****
  PATH=$PATH:/usr/ccs/bin
  
! PATH=$PATH:.
  
  MANPATH=$HOME/pub/share/man
--- 62,66 ----
  PATH=$PATH:/usr/ccs/bin
  
! PATH=$PATH:$path_as_was:.
  
  MANPATH=$HOME/pub/share/man
***************
*** 63,67 ****
  MANPATH=$MANPATH:/usr/share/man:/usr/man:/usr/sfw/man
  MANPATH=$MANPATH:/usr/openwin/share/man:/usr/openwin/man:/usr/dt/share/man:/usr/dt/man
! MANPATH=$MANPATH:/usr/ccs/man:
  # note, the empty element at the end of the MANPATH means that the
  # file /etc/man.conf is used under linux
--- 68,72 ----
  MANPATH=$MANPATH:/usr/share/man:/usr/man:/usr/sfw/man
  MANPATH=$MANPATH:/usr/openwin/share/man:/usr/openwin/man:/usr/dt/share/man:/usr/dt/man
! MANPATH=$MANPATH:/usr/ccs/man:$manpath_as_was:
  # note, the empty element at the end of the MANPATH means that the
  # file /etc/man.conf is used under linux

Index: common.sh
===================================================================
RCS file: /cvsroot/ark/sidai/user-setup/common.sh,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** common.sh	17 May 2006 10:06:57 -0000	1.17
--- common.sh	12 Mar 2007 10:53:42 -0000	1.18
***************
*** 199,206 ****
--- 199,221 ----
  #
  # terminal stuff -- must avoid if doing the CDE thing...
+ 
+ if tty -s ; then
+    is_a_tty='yes'
+ else
+    is_a_tty='no'
+ fi
+ 
+ # NB: NB: some of this logic is necessarily repeated in start-a-shell
+ 
  if [ "x$DT" != 'x' ] ; then
      login_from=CDE
      login_term=CDE_console
  
+ elif [ "x$is_a_tty" = 'xno' ] ; then
+     # dubious, yes; but we really don't want to be running tset, etc
+     # if there is simply no terminal there
+     login_from=Linux
+     login_term=Linux_WM
+ 
  elif [ "x$GDMSESSION" != 'x' ] ; then
      login_from=Linux # really GNOME

Index: csh.start-shell
===================================================================
RCS file: /cvsroot/ark/sidai/user-setup/csh.start-shell,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** csh.start-shell	26 May 2004 18:40:49 -0000	1.2
--- csh.start-shell	12 Mar 2007 10:53:42 -0000	1.3
***************
*** 40,44 ****
  #echo reading sidai csh.start-shell
  
! if ( ! $?DT ) then
      if ( "$SHELL_AS_WAS" != "$SHELL" ) then
      switch ( "$SHELL" )
--- 40,45 ----
  #echo reading sidai csh.start-shell
  
! if tty -s then	
!  if ( ! $?DT ) then
      if ( "$SHELL_AS_WAS" != "$SHELL" ) then
      switch ( "$SHELL" )
***************
*** 48,66 ****
  
        case */bash:
! 		echo "switching to $SHELL..." # really switch shell
  		exec $SHELL --login # '-login' because it's a login shell
  		breaksw
  
        case */tcsh:
! 		echo "switching to $SHELL..." # really switch shell
  		exec $SHELL # already a login shell
  		breaksw
  
        default:
! 		echo "switching to $SHELL..." # really switch shell
  		exec $SHELL '-l' 	# '-l' because it's a login shell
  		breaksw
      endsw
      endif
  endif
  
--- 49,68 ----
  
        case */bash:
! 		#?echo "switching to $SHELL..." # really switch shell
  		exec $SHELL --login # '-login' because it's a login shell
  		breaksw
  
        case */tcsh:
! 		#?echo "switching to $SHELL..." # really switch shell
  		exec $SHELL # already a login shell
  		breaksw
  
        default:
! 		#?echo "switching to $SHELL..." # really switch shell
  		exec $SHELL '-l' 	# '-l' because it's a login shell
  		breaksw
      endsw
      endif
+  endif
  endif
  

Index: sh.start-shell
===================================================================
RCS file: /cvsroot/ark/sidai/user-setup/sh.start-shell,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** sh.start-shell	17 May 2006 10:06:57 -0000	1.9
--- sh.start-shell	12 Mar 2007 10:53:42 -0000	1.10
***************
*** 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 
--- 40,47 ----
  #echo reading sidai sh.start-shell
  
! # NB: don't do this if it isn't a tty!
! 
! if tty -s ; then
!  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 
***************
*** 47,57 ****
      /bin/sh)	echo NO JOB CONTROL >&2	# stuffed!
  		;;
!     */bash)	echo "switching to $SHELL..." >&2 # really switch shell
  		exec $SHELL --login # '-login' because it's a login shell
  		;;
!     *)		echo "switching to $SHELL..." >&2 # really switch shell
  		exec $SHELL '-l' 	# '-l' because it's a login shell
  		;;
      esac
  fi
- 
--- 50,60 ----
      /bin/sh)	echo NO JOB CONTROL >&2	# stuffed!
  		;;
!     */bash)	#?echo "switching to $SHELL..." >&2 # really switch shell
  		exec $SHELL --login # '-login' because it's a login shell
  		;;
!     *)		#?echo "switching to $SHELL..." >&2 # really switch shell
  		exec $SHELL '-l' 	# '-l' because it's a login shell
  		;;
      esac
+  fi
  fi