filesystem

1 files changed, 10 insertions, 31 deletions

diff --git a/abs/core/filesystem/profile b/abs/core/filesystem/profile
index e7a958a..3bc22db 100644
--- a/abs/core/filesystem/profile
+++ b/abs/core/filesystem/profile
@@ -1,44 +1,23 @@
-# 
 # /etc/profile
-#
-# This file is intended to be used for ALL common
-# Bourne-compatible shells. Shell specifics should be
-# handled in /etc/profile.$SHELL where $SHELL is the name
-# of the binary being run (discounting symlinks)
-#
-# Sections taken from SuSe's /etc/profile
-# Note the explicit use of 'test' to cover all bases
-#  and potentially incompatible shells
-
-#Determine our shell without using $SHELL, which may lie
-shell="sh"
-if test -f /proc/mounts; then
-   case $(/bin/ls -l /proc/$$/exe) in
-        *bash) shell=bash ;;
-        *dash) shell=dash ;;
-        *ash)  shell=ash ;;
-        *ksh)  shell=ksh ;;
-        *zsh)  shell=zsh ;;
-    esac
-fi
-
-# Load shell specific profile settings
-test -f "/etc/profile.$shell" &&  . "/etc/profile.$shell"
-unset shell
 
 #Set our umask
 umask 022
 
 # Set our default path
-PATH="/bin:/usr/bin:/sbin:/usr/sbin"
+PATH="/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin"
 export PATH
 
 # Load profiles from /etc/profile.d
 if test -d /etc/profile.d/; then
-    for profile in /etc/profile.d/*.sh; do
-        test -x $profile && . $profile
-    done
-    unset profile
+	for profile in /etc/profile.d/*.sh; do
+		test -r "$profile" && . "$profile"
+	done
+	unset profile
+fi
+
+# Source global bash config
+if test "$PS1" && test "$BASH" && test -r /etc/bash.bashrc; then
+	. /etc/bash.bashrc
 fi
 
 # Termcap is outdated, old, and crusty, kill it.