[rfs-stage32] Clean up /etc/profile

1 files changed, 38 insertions, 41 deletions

diff --git a/remote/rootfs/rootfs-stage32/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile
index 36ebb4c4..b4c2400d 100644
--- a/remote/rootfs/rootfs-stage32/data/etc/profile
+++ b/remote/rootfs/rootfs-stage32/data/etc/profile
@@ -1,50 +1,47 @@
-# ~/.bashrc: executed by bash(1) for non-login interactive shells.
+# /etc/profile: system-wide .profile file for the Bourne shell (sh(1))
+# and Bourne compatible shells (bash(1), ksh(1), ash(1), ...).
+# XXX: Use `backticks` here instead of $(this stuff) as we don't know which shell is running...
+
+export UID=`id -u`
 
 # If running interactively, then:
 if [ "$PS1" ]; then
 
-    if [ "$BASH" ]; then
-	export PS1="[\u@\h \W]\\$ "
-	alias ll='ls --color=auto -laFh'
-	alias ls='ls --color=auto -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=`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
-    export TERMINFO='/lib/terminfo'
-
-    ### Some aliases
-    alias ps2='ps facux '
-    alias ps1='ps faxo "%U %t %p %a" '
-    alias af='ps af'
-    alias cls='clear'
-    alias df='df -h'
-    alias indent='indent -bad -bap -bbo -nbc -br -brs -c33 -cd33 -ncdb -ce -ci4 -cli0 -cp33 -cs -d0 -di1 -nfc1 -nfca -hnl -i4 -ip0 -l75 -lp -npcs -npsl -nsc -nsob -nss -ts4 '
-    #alias bc='bc -l'
-    alias minicom='minicom -c on'
-    alias calc='calc -Cd '
-    alias bc='calc -Cd '
-fi;
+	if [ "$BASH" ]; then
+		export PS1="[\u@\h \W]\\$ "
+	else
+		if [ "$UID" -eq 0 ]; then
+			export PS1='# '
+		else
+			export PS1='$ '
+		fi
+	fi
+
+	export HISTSIZE=1000
+	export HISTFILESIZE=1000
+	export PAGER='/bin/less'
+	export EDITOR='/bin/vi'
+	export INPUTRC=/etc/inputrc
+	#export DMALLOC_OPTIONS=debug=0x34f47d83,inter=100,log=logfile
+	export TERMINFO='/lib/terminfo'
+
+fi
+
+# Stuff we might wanna know
+PWENT=`getent passwd $USER`
+export USER=`echo "$PWENT" | awk -F ':' '{print $1}'`
+export GID=`echo "$PWENT" | awk -F ':' '{print $4}'`
+export HOME=`echo "$PWENT" | awk -F ':' '{print $6}'`
+export GROUP=`id -gn`
+export LOGNAME=$USER
+export HOSTNAME=`hostname`
+
 
 # Source configuration files from /etc/profile.d
 for i in /etc/profile.d/*.sh ; do
-    if [ -r "$i" ]; then
-        . $i
-    fi
+	if [ -r "$i" ]; then
+		. $i
+	fi
 done
 
 # Sourcing /etc/profile.local - please add custom stuff to profile.local
@@ -52,6 +49,6 @@ done
 test -s /etc/profile.local && . /etc/profile.local
 
 if [ -s "$HOME/.bashrc" ]; then
-    . "$HOME/.bashrc"
+	. "$HOME/.bashrc"
 fi