misc/72277: update for /usr/share/skel

[Jose M Rodriguez]

>Number:         72277
>Category:       misc
>Synopsis:       update for /usr/share/skel
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 03 09:00:47 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Jose M Rodriguez
>Release:        FreeBSD 5.3-BETA6 i386
>Organization:
Redes JM
>Environment:
System: FreeBSD orion.redesjm.local 5.3-BETA6 FreeBSD 5.3-BETA6 #0: Sun Sep 26 07:05:40 CEST 2004 root at antares.redesjm.local:/usr/obj/usr/src/sys/ORION i386


>Description:
	Small fixes to /usr/share/skel.
	some may reflect personal uses.
	most are of general use.


	dot.csh:
		+ protect agains /usr/bin unreadable
		+ don't use alias on non-interactive shell
		+ define ENV in dot.login
		+ merge alias defs with sh
		+ use tcsh ls-F for ls alias
		+ more and better history
		+ better prompt under tcsh

	dot.login:
		+ define ENV here
		+ use less where avaiable

	dot.login_conf
		+ use en_US.ISO8859-1

	dot.mailrc:
		+ don't use 'sets' where the system can get ENV.
		  (PAGER, EDITOR, VISUAL)

	dot.profile:
		+ use less

	dot.shrc:
		+ alias merge
		+ prompt update

>How-To-Repeat:
>Fix:

--- patch-skel begins here ---
diff -Nru share/skel.orig/dot.cshrc share/skel/dot.cshrc
--- share/skel.orig/dot.cshrc	Wed Jan 10 18:35:28 2001
+++ share/skel/dot.cshrc	Sat Aug 21 17:30:20 2004
@@ -5,30 +5,51 @@
 # see also csh(1), environ(7).
 #
 
-alias h		history 25
-alias j		jobs -l
-alias la	ls -a
-alias lf	ls -FA
-alias ll	ls -lA
+# csh doesn't handle directory in the PATH being non-readable
+if (! -r /usr/bin) unhash
 
 # A righteous 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
-
 if ($?prompt) then
 	# An interactive shell -- set some stuff up
 	set filec
-	set history = 100
-	set savehist = 100
-	set mail = (/var/mail/$USER)
+	alias h		history 25
+	alias j		jobs -l
 	if ( $?tcsh ) then
 		bindkey "^W" backward-delete-word
 		bindkey -k up history-search-backward
 		bindkey -k down history-search-forward
+		set history = 2048
+		set savehist = (2048 merge)
+		set mail = (300 /var/mail/$USER)
+		alias l		ls-F -l
+		alias la	ls-F -a
+		alias lf	ls-F -A
+		alias ll	ls-F -lao
+		if ($?REMOTEHOST) then
+			set prompt = "%n@%B%m%b %c2%# "
+		else if (`id -u` >= 500) then
+			set ellipsis
+			set prompt = "%n %c02%# "
+		else
+			set prompt = "%c2%# "
+		endif
+	else
+		set history = 100
+		set savehist = 100
+		set mail = (/var/mail/$USER)
+		alias l		ls -Fl
+		alias la	ls -Fa
+		alias lf	ls -FA
+		alias ll	ls -laFo
+		set prompt = "`id -nu`@`hostname -s`"
+		if (`id -u` == 0) then
+			set prompt = "${prompt}# "
+		else
+			set prompt = "${prompt}> "
+		endif
 	endif
 endif
diff -Nru share/skel.orig/dot.login share/skel/dot.login
--- share/skel.orig/dot.login	Mon Jun 25 22:40:02 2001
+++ share/skel/dot.login	Sat Aug 21 17:34:40 2004
@@ -5,4 +5,12 @@
 # see also csh(1), environ(7).
 #
 
-[ -x /usr/games/fortune ] && /usr/games/fortune freebsd-tips
+setenv	EDITOR	vi
+if (-x /usr/bin/less) then
+	setenv	PAGER	less
+else
+	setenv	PAGER	more
+endif
+setenv	BLOCKSIZE	K
+
+if (-x /usr/games/fortune) /usr/games/fortune freebsd-tips
diff -Nru share/skel.orig/dot.login_conf share/skel/dot.login_conf
--- share/skel.orig/dot.login_conf	Sun Jun 10 19:08:53 2001
+++ share/skel/dot.login_conf	Sat Aug 21 17:35:14 2004
@@ -4,4 +4,4 @@
 #
 #me:\
 #	:charset=iso-8859-1:\
-#	:lang=de_DE.ISO8859-1:
+#	:lang=en_US.ISO8859-1:
diff -Nru share/skel.orig/dot.mailrc share/skel/dot.mailrc
--- share/skel.orig/dot.mailrc	Sat Aug 28 02:21:53 1999
+++ share/skel/dot.mailrc	Sat Aug 21 17:36:13 2004
@@ -7,9 +7,6 @@
 
 set append ask autoprint 
 set indentprefix="> "
-set PAGER=more
-set EDITOR=vi
-set VISUAL=vi
 set folder=Mail
 retain bcc cc date from subject to
 
diff -Nru share/skel.orig/dot.profile share/skel/dot.profile
--- share/skel.orig/dot.profile	Sun Jul  7 02:00:54 2002
+++ share/skel/dot.profile	Sat Aug 21 17:38:54 2004
@@ -14,9 +14,11 @@
 # Use cons25l1 for iso-* fonts
 # TERM=cons25; 	export TERM
 
-BLOCKSIZE=K;	export BLOCKSIZE
-EDITOR=vi;   	export EDITOR
-PAGER=more;  	export PAGER
+BLOCKSIZE=K;
+EDITOR=vi;
+PAGER=more;
+[ -x /usr/bin/less ] && PAGER=less
+export BLOCKSIZE EDITOR PAGER
 
 # set ENV to a file invoked each time sh is started for interactive use.
 ENV=$HOME/.shrc; export ENV
diff -Nru share/skel.orig/dot.shrc share/skel/dot.shrc
--- share/skel.orig/dot.shrc	Tue Jul 23 14:28:16 2002
+++ share/skel/dot.shrc	Sun Aug 22 09:44:24 2004
@@ -27,7 +27,9 @@
 alias j=jobs
 alias m=$PAGER
 alias ll='ls -laFo'
-alias l='ls -l'
+alias l='ls -lF'
+alias la='ls -Fa'
+alias lf='ls -FA'
 alias g='egrep -i'
  
 # # be paranoid
@@ -37,7 +39,7 @@
 
 
 # # set prompt: ``username at hostname$ '' 
-# PS1="`whoami`@`hostname | sed 's/\..*//'`"
+# PS1="`id -nu`@`hostname -s`"
 # case `id -u` in
 # 	0) PS1="${PS1}# ";;
 # 	*) PS1="${PS1}$ ";;
--- patch-skel ends here ---



>Release-Note:
>Audit-Trail:
>Unformatted: