Changed env sourcing order
This commit is contained in:
parent
4f8e48cea3
commit
04283cbcb5
15
bash/rbashrc
15
bash/rbashrc
@ -10,20 +10,19 @@ __SCRIPT=$BASH_SOURCE
|
|||||||
RBASH_HOME="$HOME/.rbash"
|
RBASH_HOME="$HOME/.rbash"
|
||||||
RBASH_SOURCES="$RBASH_HOME/sources"
|
RBASH_SOURCES="$RBASH_HOME/sources"
|
||||||
RBASH_CONFIG="$RBASH_HOME/config"
|
RBASH_CONFIG="$RBASH_HOME/config"
|
||||||
|
RBASH_ENV="$RBASH_HOME/env"
|
||||||
RBASH_REMOTE="https://git.k8s.astropenguin.net"
|
RBASH_REMOTE="https://git.k8s.astropenguin.net"
|
||||||
RBASH_REPO="penguin/utils"
|
RBASH_REPO="penguin/utils"
|
||||||
RBASH_PATH="bash"
|
RBASH_PATH="bash"
|
||||||
|
|
||||||
|
export PS1='This is <MACHINE_NAME>\e[1;3<COLOR_CODE>m<MACHINE_COLORED_NAME>\e[0m: \w\n\$ '
|
||||||
|
export EDITOR=vim
|
||||||
|
|
||||||
# Source global definitions
|
# Source global definitions
|
||||||
if [ -f /etc/bashrc ]; then
|
if [ -f /etc/bashrc ]; then
|
||||||
. /etc/bashrc
|
. /etc/bashrc
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Source for Custom bash ENV
|
|
||||||
if [ -f ~/.rbashenv ]; then
|
|
||||||
. ~/.rbashenv
|
|
||||||
fi
|
|
||||||
|
|
||||||
# The merged sources
|
# The merged sources
|
||||||
RBASH_MERGED="$RBASH_SOURCES/merged"
|
RBASH_MERGED="$RBASH_SOURCES/merged"
|
||||||
|
|
||||||
@ -289,8 +288,10 @@ function r2dissource {
|
|||||||
rm -r "$_dis" "$RBASH_SOURCES"
|
rm -r "$_dis" "$RBASH_SOURCES"
|
||||||
}
|
}
|
||||||
|
|
||||||
export PS1='This is <MACHINE_NAME>\e[1;3<COLOR_CODE>m<MACHINE_COLORED_NAME>\e[0m: \w\n\$ '
|
# Source for custom bash env, allows overriding
|
||||||
export EDITOR=vim
|
if [ -f "$RBASH_ENV" ]; then
|
||||||
|
source "$RBASH_ENV"
|
||||||
|
fi
|
||||||
|
|
||||||
# Create default source config
|
# Create default source config
|
||||||
if [ ! -f "$RBASH_CONFIG" ]; then
|
if [ ! -f "$RBASH_CONFIG" ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user