diff mbox

[v3,1/3] skeleton: Clean up profile file

Message ID 1443881664-9100-1-git-send-email-maxime.hadjinlian@gmail.com
State Superseded
Headers show

Commit Message

Maxime Hadjinlian Oct. 3, 2015, 2:14 p.m. UTC 
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 <maxime.hadjinlian@gmail.com>
---
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

Comments

Arnout Vandecappelle Oct. 3, 2015, 2:27 p.m. UTC | #1 
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 <maxime.hadjinlian@gmail.com>
> ---
> 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 Oct. 3, 2015, 2:34 p.m. UTC | #2 
On 03-10-15 15:27, Arnout Vandecappelle wrote:
> 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 <maxime.hadjinlian@gmail.com>

 My comments were just nit-picking, so:

Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>


 Regards,
 Arnout

>> ---
>> 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
>>
> 
>
diff mbox

Patch

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
-
-    export USER=`id -un`
-    export LOGNAME=$USER
-    export HOSTNAME=`/bin/hostname`
-    export HISTSIZE=1000
-    export HISTFILESIZE=1000
-    export PAGER='/bin/more '
-    export EDITOR='/bin/vi'
-    export INPUTRC=/etc/inputrc
-    export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
-
-fi;
+/usr/sbin
 
-if [ -z "$LANG" ]; then
-  if [ -n $HOME ] && [ -r $HOME/.config/locale.conf ]; then
-    . "$HOME/.config/locale.conf"
-  elif [ -r /etc/locale.conf ]; then
-    . /etc/locale.conf
-  fi
+if [ "`id -u`" -eq 0 ]; then
+    export PS1='# '
+else
+    export PS1='$ '
 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
 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