svn commit: r337849 - in head: bin/csh bin/sh etc etc/root

[Brad Davis]

On Wed, Aug 15, 2018, at 9:27 AM, Oliver Pinter wrote:
> 
> 
> On Wednesday, August 15, 2018, Brad Davis <brd at freebsd.org> wrote:
>> Author: brd
>>  Date: Wed Aug 15 14:41:24 2018
>>  New Revision: 337849
>>  URL: https://svnweb.freebsd.org/changeset/base/337849
>>  
>>  Log:
>>    Move all sh and csh files into bin/sh/ or bin/csh/
>>  
>>    This simplifies pkgbase by migrating these to CONFS so they are properly
>>    tagged as config files.
>>  
>>    Approved by:  will (mentor)
>>    Differential Revision:        https://reviews.freebsd.org/D16708
>>  
>>  Added:
>>    head/bin/csh/csh.cshrc
>>       - copied unchanged from r337848, head/etc/csh.cshrc
>>    head/bin/csh/csh.login
>>       - copied unchanged from r337848, head/etc/csh.login
>>    head/bin/csh/csh.logout
>>       - copied unchanged from r337848, head/etc/csh.logout
>>    head/bin/csh/dot.cshrc
>>       - copied unchanged from r337848, head/etc/root/dot.cshrc
>>    head/bin/csh/dot.login
>>       - copied unchanged from r337848, head/etc/root/dot.login
>>    head/bin/sh/dot.profile
>>       - copied unchanged from r337848, head/etc/root/dot.profile
>>    head/bin/sh/profile
>>       - copied unchanged from r337848, head/etc/profile
>>  Deleted:
>>    head/etc/csh.cshrc
>>    head/etc/csh.login
>>    head/etc/csh.logout
>>    head/etc/profile
>>    head/etc/root/dot.cshrc
>>    head/etc/root/dot.login
>>    head/etc/root/dot.profile
>>  Modified:
>>    head/bin/csh/Makefile
>>    head/bin/sh/Makefile
>>    head/etc/Makefile
>>  
>>  Modified: head/bin/csh/Makefile
>>  ==============================================================================
>>  --- head/bin/csh/Makefile       Wed Aug 15 14:29:04 2018        (r337848)
>>  +++ head/bin/csh/Makefile       Wed Aug 15 14:41:24 2018        (r337849)
>>  @@ -8,6 +8,11 @@
>>  
>>   .include <src.opts.mk>
>>  
>>  +CONFGROUPS=    ETC ROOT
>>  +ETC=   csh.cshrc csh.login csh.logout
>>  +ROOT=  dot.cshrc
>>  +ROOTDIR=       /root
>>  +ROOTNAME=      .cshrc
>>   PACKAGE=runtime
>>   TCSHDIR= ${SRCTOP}/contrib/tcsh
>>   .PATH: ${TCSHDIR}
>>  @@ -44,7 +49,8 @@ MLINKS= csh.1 tcsh.1
>>  
>>   LIBADD=        termcapw crypt
>>  
>>  -LINKS= ${BINDIR}/csh ${BINDIR}/tcsh
>>  +LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
>>  +       /root/.cshrc /.cshrc
>>  
>>   CLEANFILES= ${GENHDRS} gethost csh.1
>>  
>>  @@ -147,5 +153,12 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
>>              sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
>>              sort >> ${.TARGET}
>>          @echo '#endif /* _h_tc_const */' >> ${.TARGET}
>>  +
>>  +beforeinstall:
>>  +       rm -f ${DESTDIR}/.cshrc
>>  +
>>  +afterinstallconfig:
>>  +       sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
> 
> Why? If afterinstallconfig called unconditionally after install, then why changing all of the csh entries to sh?
> 
> The old behavior was almost the same, but only when WITHOUT_CSH was specified. 
> 
> Fixme if I'm wrong. 

You are correct, I have opened: https://reviews.freebsd.org/D16725


Regards,
Brad Davis