From bddc1909cfe20eb29d92d96321a0d34a17718921 Mon Sep 17 00:00:00 2001
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 25 Mar 2000 20:23:39 +0000
Subject: [PATCH] o Migrate path, umask from dot.login to dot.cshrc o Comment
 out display of fortune by default. o Synch root's .cshrc/.login and
 non-root's .cshrc/.login in terms of   gratuitous variables set (EDITOR). o
 Remove some commented out variables set inconsistently or gratuitously,  
 such as Interviews settings, 8-bit German locale for root only. o Synchronize
 comments in header, as well as references to appropriate man   pages. o
 Remove MANPATH setting as apparently /etc/manpath.config does all that  
 already.

Similar changes probably need to be made in other dot.* files for root
and skel, as all of these files seem to set different aliases, environmental
variables, prompts, and have different semantics.

As a result of this patch, leaving aside the setting of a special prompt
for root, users of csh and tcsh should find similar environments when
logging in or su'ing to any account using that shell.

Reviewed by:	asmodai, nbm, will
---
 etc/root/dot.cshrc   | 12 +++++++++---
 etc/root/dot.login   | 18 +++++-------------
 share/skel/dot.cshrc |  8 ++++++--
 share/skel/dot.login | 17 +++--------------
 4 files changed, 23 insertions(+), 32 deletions(-)

diff --git a/etc/root/dot.cshrc b/etc/root/dot.cshrc
index 38a71cfbcbfc..ac92258f9640 100644
--- a/etc/root/dot.cshrc
+++ b/etc/root/dot.cshrc
@@ -1,6 +1,9 @@
 # $FreeBSD$
 #
-#csh .cshrc file
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+#
 
 alias h		history 25
 alias j		jobs -l
@@ -8,9 +11,12 @@ alias la	ls -a
 alias lf	ls -FA
 alias ll	ls -lA
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
-setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man"
+# A rightous umask
+umask 22
 
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
+
+setenv	EDITOR	vi
 setenv	PAGER	more
 setenv	BLOCKSIZE	K
 
diff --git a/etc/root/dot.login b/etc/root/dot.login
index 659db13721fb..5a45f104644e 100644
--- a/etc/root/dot.login
+++ b/etc/root/dot.login
@@ -1,17 +1,9 @@
 # $FreeBSD$
 #
-# csh .login file
+# .login - csh login script, read by login shell, after `.cshrc' at login.
+#
+# see also csh(1), environ(7).
 #
 
-# Interviews settings
-#setenv CPU "FREEBSD"
-#set path = ($path /usr/local/interviews/bin/$CPU)
-#setenv MANPATH "${MANPATH}:/usr/local/interviews/man"
-
-# 8-bit locale (Germany)
-#setenv LANG de_DE.ISO_8859-1
-
-# A righteous umask
-umask 22
-
-[ -x /usr/games/fortune ] && /usr/games/fortune
+# Uncomment to display a random cookie each login:
+# [ -x /usr/games/fortune ] && /usr/games/fortune
diff --git a/share/skel/dot.cshrc b/share/skel/dot.cshrc
index 45f376775af0..490a69475942 100644
--- a/share/skel/dot.cshrc
+++ b/share/skel/dot.cshrc
@@ -1,7 +1,6 @@
 # $FreeBSD$
 #
-# .cshrc - csh resource script, read at beginning 
-#	   of execution by each shell
+# .cshrc - csh resource script, read at beginning of execution by each shell
 #
 # see also csh(1), environ(7).
 #
@@ -12,6 +11,11 @@ alias la	ls -a
 alias lf	ls -FA
 alias ll	ls -lA
 
+# A rightous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/sbin /usr/local/bin /usr/X11R6/bin $HOME/bin)
+
 setenv	EDITOR	vi
 setenv	PAGER	more
 setenv	BLOCKSIZE	K
diff --git a/share/skel/dot.login b/share/skel/dot.login
index d59a727ccc97..3032ef97c762 100644
--- a/share/skel/dot.login
+++ b/share/skel/dot.login
@@ -1,20 +1,9 @@
 # $FreeBSD$
 #
-# .login - csh login script, read by login shell, 
-#	   after `.cshrc' at login.
+# .login - csh login script, read by login shell, after `.cshrc' at login.
 #
 # see also csh(1), environ(7).
 #
 
-set path = (/sbin /bin /usr/sbin /usr/bin /usr/games /usr/local/bin /usr/X11R6/bin $HOME/bin)
-#setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man"
-
-# Interviews settings
-#setenv CPU "FREEBSD"
-#set path = ($path /usr/local/interviews/bin/$CPU)
-#setenv MANPATH "${MANPATH}:/usr/local/interviews/man"
-
-# A rightous umask
-umask 22
-
-[ -x /usr/games/fortune ] && /usr/games/fortune -s
+# Uncomment to display a random cookie each login:
+# [ -x /usr/games/fortune ] && /usr/games/fortune -s