Load local vars before anything else.

master
Icedream 2018-10-11 10:13:45 +02:00
parent 2c78ff0816
commit 0f848451f6
Signed by: icedream
GPG Key ID: 1573F6D8EFE4D0CF
2 changed files with 27 additions and 26 deletions

View File

@ -99,6 +99,19 @@ section_end
############################################################################## ##############################################################################
# Actual profile code from here # Actual profile code from here
section "custom profile"
if [ $PROFILE_CUSTOM -gt 0 ]; then
log "Checking if local profile code exists at ~/.local_profile..."
if [ -f ~/.local_profile ]; then
log "Exists, loading."
# shellcheck source=/dev/null
. ~/.local_profile
else
log "Does not exist, skipping."
fi
fi
section_end
section "thefuck" section "thefuck"
if [ $PROFILE_THEFUCK -gt 0 ]; then if [ $PROFILE_THEFUCK -gt 0 ]; then
eval "$(thefuck --alias)" eval "$(thefuck --alias)"
@ -249,16 +262,3 @@ if [ $PROFILE_SYSTEMD -gt 0 ]; then
log "$(systemctl --user import-environment PATH)" log "$(systemctl --user import-environment PATH)"
fi fi
section_end section_end
section "custom profile"
if [ $PROFILE_CUSTOM -gt 0 ]; then
log "Checking if local profile code exists at ~/.local_profile..."
if [ -f ~/.local_profile ]; then
log "Exists, loading."
# shellcheck source=/dev/null
. ~/.local_profile
else
log "Does not exist, skipping."
fi
fi
section_end

View File

@ -45,6 +45,20 @@ log() {
fi fi
} }
# Custom variables
section "custom zshrc"
if [ $ZSH_CUSTOM -gt 0 ]; then
log "Checking if local profile code exists at ~/.local_zshrc..."
if [ -f ~/.local_zshrc ]; then
log "Exists, loading."
# shellcheck source=/dev/null
. ~/.local_zshrc
else
log "Does not exist, skipping."
fi
fi
section_end
# Bin directories # Bin directories
section "python bin" section "python bin"
if [ -d "$HOME/Library/Python/3.7" ]; then if [ -d "$HOME/Library/Python/3.7" ]; then
@ -176,19 +190,6 @@ if [ $ZSH_PRINT_REBOOT_REQUIRED -gt 0 ]; then
fi fi
section_end section_end
section "custom zshrc"
if [ $ZSH_CUSTOM -gt 0 ]; then
log "Checking if local profile code exists at ~/.local_zshrc..."
if [ -f ~/.local_zshrc ]; then
log "Exists, loading."
# shellcheck source=/dev/null
. ~/.local_zshrc
else
log "Does not exist, skipping."
fi
fi
section_end
# print env # print env
section "Environment variables" section "Environment variables"