summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bashrc/main.sh38
1 files changed, 2 insertions, 36 deletions
diff --git a/bashrc/main.sh b/bashrc/main.sh
index 911f535..5eed6ca 100644
--- a/bashrc/main.sh
+++ b/bashrc/main.sh
@@ -70,7 +70,7 @@ _load() {
if [[ -r ${base}/${path} ]]; then
source ${base}/${path} 2>&1 > /dev/null
- elif [[ $1 == "node" && $2 == "*" ]]; then
+ elif [[ $2 == "*" ]]; then
for file in ${base}/${path}; do
if [[ -r $file ]]; then
source $file 2>&1 > /dev/null
@@ -84,46 +84,12 @@ _load() {
# update first
_self_update
-# locale should be set first
-_load common locale
-
-# now set a reasonable environment
-_load common env
-
-# bash configuration
-_load common shopt
+_load common '*'
# load internals
_load dist init
_load node init
-# command aliases
-_load common alias
-
-# ssh agent forwarding
-_load common ssh-agent-forwarding
-
-# pager options
-_load common pager
-
-# browser options
-_load common browser
-
-# color code definitions
-_load common color
-
-# colored output for ls
-_load common dircolors
-
-# command prompt
-_load common prompt
-
-# screen shelltitle magic
-_load common screen
-
-# bash completion
-_load common bashcomp
-
# load common distribution settings
_load dist common