From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnout Vandecappelle Date: Sat, 3 Oct 2015 15:27:35 +0100 Subject: [Buildroot] [PATCH v3 1/3] skeleton: Clean up profile file In-Reply-To: <1443881664-9100-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1443881664-9100-1-git-send-email-maxime.hadjinlian@gmail.com> Message-ID: <560FE5D7.5070002@mind.be> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net On 03-10-15 15:14, Maxime Hadjinlian wrote: > There's a lot of code in /etc/profile, which doesn't really belong in a > minimal default skeleton. > > If the user has a specific needs, it needs to be added in > /etc/profile.d/ by a post-build script. > > Signed-off-by Maxime Hadjinlian > --- > v1 -> v2: > - Don't change indent and don't fix 'pretty' stuff > - Keep PS1 , PAGER and EDITOR setted. > - At the end of the for loop, add unset i > --- > system/skeleton/etc/profile | 60 +++++-------------------------------- > system/skeleton/etc/profile.d/umask | 1 + > 2 files changed, 9 insertions(+), 52 deletions(-) > create mode 100644 system/skeleton/etc/profile.d/umask > > diff --git a/system/skeleton/etc/profile b/system/skeleton/etc/profile > index c7438fe..c40a311 100644 > --- a/system/skeleton/etc/profile > +++ b/system/skeleton/etc/profile > @@ -1,66 +1,22 @@ > -# ~/.bashrc: executed by bash(1) for non-login interactive shells. > - > export PATH=\ > /bin:\ > /sbin:\ > /usr/bin:\ > -/usr/sbin:\ > -/usr/local/bin > - > -# If running interactively, then: > -if [ "$PS1" ]; then > - > - if [ "$BASH" ]; then > - export PS1="[\u@\h \W]\\$ " > - alias ll='/bin/ls --color=tty -laFh' > - alias ls='/bin/ls --color=tty -F' > - export LS_COLORS='no=00:fi=00:di=01;34:ln=01;36:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arj=01;31:*.taz=01;31:*.lzh=01;31:*.zip=01;31:*.z=01;31:*.Z=01;31:*.gz=01;31:*.bz2=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.jpg=01;35:*.jpeg=01;35:*.png=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.mpg=01;35:*.mpeg=01;35:*.avi=01;35:*.fli=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:'; > - else > - if [ "`id -u`" -eq 0 ]; then > - export PS1='# ' > - else > - export PS1='$ ' > - fi > - fi [snip] > +if [ "`id -u`" -eq 0 ]; then > + export PS1='# ' > +else > + export PS1='$ ' Previously, this was inside an if [ "$PS1" ]; i.e. only set for interactive shells. Perhaps that should be kept. Not really essential, though. > fi > > -LANG=${LANG:-C} > -export LANG > -[ -n "$LC_CTYPE" ] && export LC_CTYPE > -[ -n "$LC_NUMERIC" ] && export LC_NUMERIC > -[ -n "$LC_TIME" ] && export LC_TIME > -[ -n "$LC_COLLATE" ] && export LC_COLLATE > -[ -n "$LC_MONETARY" ] && export LC_MONETARY > -[ -n "$LC_MESSAGES" ] && export LC_MESSAGES > -[ -n "$LC_PAPER" ] && export LC_PAPER > -[ -n "$LC_NAME" ] && export LC_NAME > -[ -n "$LC_ADDRESS" ] && export LC_ADDRESS > -[ -n "$LC_TELEPHONE" ] && export LC_TELEPHONE > -[ -n "$LC_MEASUREMENT" ] && export LC_MEASUREMENT > -[ -n "$LC_IDENTIFICATION" ] && export LC_IDENTIFICATION > +export PAGER='/bin/more ' > +export EDITOR='/bin/vi' > > # Source configuration files from /etc/profile.d > for i in /etc/profile.d/*.sh ; do > if [ -r "$i" ]; then > . $i > fi > + unset i You forgot to mention this in the commit message :-P Regards, Arnout > done > diff --git a/system/skeleton/etc/profile.d/umask b/system/skeleton/etc/profile.d/umask > new file mode 100644 > index 0000000..8e71ad5 > --- /dev/null > +++ b/system/skeleton/etc/profile.d/umask > @@ -0,0 +1 @@ > +umask 022 > -- Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF