CVS commit: src

On Thu, Aug 31, 2006 at 10:49:55PM +0000, Hubert Feyrer
wrote:
> 
> Module Name:	src
> Committed By:	hubertf
> Date:		Thu Aug 31 22:49:55 UTC 2006
> 
> Modified Files:
> 	src/distrib/sets/lists/etc: mi
> 	src/etc/skel: dot.profile
> Added Files:
> 	src/etc/skel: dot.shrc
> 
> Log Message:
> Sync behaviour of sh and ksh dotfiles for new users
with those of root.
> Addresses PR 32215 by Wouter Schoot

Thanks. Would it make sense to have a system-wide file
(/etc/shrc) that is
included by .shrc ?

Pavel

On Fri, 1 Sep 2006, Pavel Cahyna wrote:
>> 	src/distrib/sets/lists/etc: mi
>> 	src/etc/skel: dot.profile
>> Added Files:
>> 	src/etc/skel: dot.shrc
>>
>> Log Message:
>> Sync behaviour of sh and ksh dotfiles for new users
with those of root.
>> Addresses PR 32215 by Wouter Schoot
>
> Thanks. Would it make sense to have a system-wide file
(/etc/shrc) that is
> included by .shrc ?

That would be a seperate change. Given that there's quite
some overlap 
between /root/.* and /etc/skel/.* that may make sense. Feel
free to pick 
this up.


  - Hubert

On Fri, Sep 01, 2006 at 01:42:22PM +0200, Hubert Feyrer
wrote:
> On Fri, 1 Sep 2006, Pavel Cahyna wrote:
> >>	src/distrib/sets/lists/etc: mi
> >>	src/etc/skel: dot.profile
> >>Added Files:
> >>	src/etc/skel: dot.shrc
> >>
> >>Log Message:
> >>Sync behaviour of sh and ksh dotfiles for new
users with those of root.
> >>Addresses PR 32215 by Wouter Schoot
> >
> >Thanks. Would it make sense to have a system-wide
file (/etc/shrc) that is
> >included by .shrc ?
> 
> That would be a seperate change. Given that there's
quite some overlap between 
> /root/.* and /etc/skel/.* that may make sense. Feel
free to pick this up.

Like this?

Index: root/dot.shrc
============================================================
=======
RCS file: /cvsroot/src/etc/root/dot.shrc,v
retrieving revision 1.6
diff -u -r1.6 dot.shrc
--- root/dot.shrc	1 Apr 2001 01:32:10 -0000	1.6
+++ root/dot.shrc	1 Sep 2006 13:25:07 -0000
 -1,10
+1,10 
 #	$NetBSD: dot.shrc,v 1.6 2001/04/01 01:32:10 toddpw Exp $
 
+. /etc/shrc
+
 hup(){ (read pid; kill -HUP $pid) </var/run/$1.pid; }
-ll(){ ls -l ${1+"$"}; }
 
 case "$-" in *i*)
-	PS1="${HOST%%.*}$PS1"
-	set -o emacs
+	# interactive mode settings go here
 	;;
 esac
Index: skel/dot.shrc
============================================================
=======
RCS file: /cvsroot/src/etc/skel/dot.shrc,v
retrieving revision 1.1
diff -u -r1.1 dot.shrc
--- skel/dot.shrc	31 Aug 2006 22:49:55 -0000	1.1
+++ skel/dot.shrc	1 Sep 2006 13:25:07 -0000
 -1,9
+1,8 
 #	$NetBSD: dot.shrc,v 1.1 2006/08/31 22:49:55 hubertf Exp $
 
-ll(){ ls -l ${1+"$"}; }
+. /etc/shrc
 
 case "$-" in *i*)
-	PS1="${HOST%%.*}$PS1"
-	set -o emacs
+	# interactive mode settings go here
 	;;
 esac
ll(){ ls -l ${1+"$"}; }

case "$-" in *i*)
	PS1="${HOST%%.*}$PS1"
	set -o emacs
	;;
esac

On Fri, 1 Sep 2006, Pavel Cahyna wrote:
> Like this?

Looking at the sh(1) and ksh(1) manpages, I think this is
redundant, as 
there's already /etc/profile that's read by both sh(1) and
ksh(1).
Maybe move the "common" code there, intead of
creating an extra file?


  - Hubert

On Fri, 1 Sep 2006, Hubert Feyrer wrote:
> Looking at the sh(1) and ksh(1) manpages, I think this
is redundant, as 
> there's already /etc/profile that's read by both
sh(1) and ksh(1).
> Maybe move the "common" code there, intead
of creating an extra file?

Wait, /etc/profile is only read on first startup... doh!


  - Hubert