Skip to contentSkip to conversation

skeleton: Clean up profile file

PATCH Superseded Maxime Hadjinlian 2 participants 7 messages Oct 3, 2015

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Maxime Hadjinlian

author
#0 lore raw

PATCH v3 1/3 skeleton: Clean up profile file

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 <[email protected]>
---
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
system/skeleton/etc/profile +8 -52
index c7438fe..c40a311 100644
@@ -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
system/skeleton/etc/profile.d/umask new file +1 -0
new file mode 100644
index 0000000..8e71ad5
@@ -0,0 +1 @@
+umask 022
Signature · 1 line
2.5.3
author
#1 lore raw

PATCH v3 2/3 skeleton: Remove bash specific files

Signed-off-by Maxime Hadjinlian <[email protected]>

---
 system/skeleton/root/.bash_history | 0
 system/skeleton/root/.bash_logout  | 7 -------
 system/skeleton/root/.bash_profile | 7 -------
 3 files changed, 14 deletions(-)
 delete mode 100644 system/skeleton/root/.bash_history
 delete mode 100644 system/skeleton/root/.bash_logout
 delete mode 100644 system/skeleton/root/.bash_profile
system/skeleton/root/.bash_history deleted +0 -0
deleted file mode 100644
index e69de29..0000000
system/skeleton/root/.bash_logout deleted +0 -7
deleted file mode 100644
index 77ef1f9..0000000
@@ -1,7 +0,0 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
-# when leaving the console clear the screen to increase privacy
-
-case "`tty`" in
-    /dev/tty[0-9]*) clear
-esac
system/skeleton/root/.bash_profile deleted +0 -7
deleted file mode 100644
index 0ee04a3..0000000
@@ -1,7 +0,0 @@
-# .bash_profile
-
-umask 022
-
-if [ -f ~/.bashrc ]; then
-    source ~/.bashrc
-fi
Signature · 1 line
2.5.3
#2 lore raw

PATCH v3 2/3 skeleton: Remove bash specific files

Quoted 1 line · Maxime Hadjinlian

Signed-off-by Maxime Hadjinlian <[email protected]>

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>
Quoted 39 lines
---
 system/skeleton/root/.bash_history | 0
 system/skeleton/root/.bash_logout  | 7 -------
 system/skeleton/root/.bash_profile | 7 -------
 3 files changed, 14 deletions(-)
 delete mode 100644 system/skeleton/root/.bash_history
 delete mode 100644 system/skeleton/root/.bash_logout
 delete mode 100644 system/skeleton/root/.bash_profile
system/skeleton/root/.bash_history deleted +0 -0
deleted file mode 100644
index e69de29..0000000
system/skeleton/root/.bash_logout deleted +0 -7
deleted file mode 100644
index 77ef1f9..0000000
@@ -1,7 +0,0 @@
-# ~/.bash_logout: executed by bash(1) when login shell exits.
-
-# when leaving the console clear the screen to increase privacy
-
-case "`tty`" in
-    /dev/tty[0-9]*) clear
-esac
system/skeleton/root/.bash_profile deleted +0 -7
deleted file mode 100644
index 0ee04a3..0000000
@@ -1,7 +0,0 @@
-# .bash_profile
-
-umask 022
-
-if [ -f ~/.bashrc ]; then
-    source ~/.bashrc
-fi
Signature · 6 lines
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
author
#3 lore raw

PATCH v3 3/3 skeleton: Pretty fixes for /etc/profile

In reply to Maxime Hadjinlian

Fix indent and put PATH on a single line.

Signed-off-by Maxime Hadjinlian <[email protected]>
---
 system/skeleton/etc/profile | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
system/skeleton/etc/profile +7 -11
index c40a311..df0be7f 100644
@@ -1,13 +1,9 @@
-export PATH=\
-/bin:\
-/sbin:\
-/usr/bin:\
-/usr/sbin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 if [ "`id -u`" -eq 0 ]; then
-    export PS1='# '
+	export PS1='# '
 else
-    export PS1='$ '
+	export PS1='$ '
 fi
 
 export PAGER='/bin/more '

@@ -15,8 +11,8 @@ 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
+	if [ -r "$i" ]; then
+		. $i
+	fi
+	unset i
 done
Signature · 1 line
2.5.3
#4 lore raw

PATCH v3 3/3 skeleton: Pretty fixes for /etc/profile

Quoted 3 lines · Maxime Hadjinlian

Fix indent and put PATH on a single line.

Signed-off-by Maxime Hadjinlian <[email protected]>
Acked-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Verified that patch is whitespace-only except for the removed \.

Regards,
Arnout

Quoted 39 lines
---
 system/skeleton/etc/profile | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)
system/skeleton/etc/profile +7 -11
index c40a311..df0be7f 100644
@@ -1,13 +1,9 @@
-export PATH=\
-/bin:\
-/sbin:\
-/usr/bin:\
-/usr/sbin
+export PATH=/bin:/sbin:/usr/bin:/usr/sbin
 
 if [ "`id -u`" -eq 0 ]; then
-    export PS1='# '
+	export PS1='# '
 else
-    export PS1='$ '
+	export PS1='$ '
 fi
 
 export PAGER='/bin/more '

@@ -15,8 +11,8 @@ 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
+	if [ -r "$i" ]; then
+		. $i
+	fi
+	unset i
 done
Signature · 6 lines
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
#5 lore raw

PATCH v3 1/3 skeleton: Clean up profile file

In reply to Maxime Hadjinlian
Quoted 47 lines · Maxime Hadjinlian

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 <[email protected]>
---
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
system/skeleton/etc/profile +0 -20
index c7438fe..c40a311 100644
@@ -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]

system/skeleton/etc/profile line 10

Quoted 4 lines
system/skeleton/etc/profile +4 -0
+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.

Quoted 15 lines

fi

system/skeleton/etc/profile +0 -13
-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

system/skeleton/etc/profile line 21

Quoted 10 lines
system/skeleton/etc/profile +3 -1
-[ -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

Quoted 9 lines

done

system/skeleton/etc/profile.d/umask new file +1 -0
new file mode 100644
index 0000000..8e71ad5
@@ -0,0 +1 @@
+umask 022
Signature · 6 lines
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
#6 lore raw

PATCH v3 1/3 skeleton: Clean up profile file

Quoted 8 lines · Arnout Vandecappelle
Quoted 7 lines · Maxime Hadjinlian

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 <[email protected]>

My comments were just nit-picking, so:

Reviewed-by Arnout Vandecappelle (Essensium/Mind) <[email protected]>

Regards,
Arnout

Quoted 93 lines
Quoted 40 lines

---
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
system/skeleton/etc/profile +0 -20
index c7438fe..c40a311 100644
@@ -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]

system/skeleton/etc/profile line 10

Quoted 4 lines
system/skeleton/etc/profile +4 -0
+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.

Quoted 15 lines

fi

system/skeleton/etc/profile +0 -13
-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

system/skeleton/etc/profile line 21

Quoted 10 lines
system/skeleton/etc/profile +3 -1
-[ -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

Quoted 9 lines

done

system/skeleton/etc/profile.d/umask new file +1 -0
new file mode 100644
index 0000000..8e71ad5
@@ -0,0 +1 @@
+umask 022
Signature · 6 lines
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