Load local vars before anything else.
							parent
							
								
									2c78ff0816
								
							
						
					
					
						commit
						0f848451f6
					
				| 
						 | 
				
			
			@ -99,6 +99,19 @@ section_end
 | 
			
		|||
##############################################################################
 | 
			
		||||
# 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"
 | 
			
		||||
if [ $PROFILE_THEFUCK -gt 0 ]; then
 | 
			
		||||
	eval "$(thefuck --alias)"
 | 
			
		||||
| 
						 | 
				
			
			@ -249,16 +262,3 @@ if [ $PROFILE_SYSTEMD -gt 0 ]; then
 | 
			
		|||
	log "$(systemctl --user import-environment PATH)"
 | 
			
		||||
fi
 | 
			
		||||
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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -45,6 +45,20 @@ log() {
 | 
			
		|||
	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
 | 
			
		||||
section "python bin"
 | 
			
		||||
if [ -d "$HOME/Library/Python/3.7" ]; then
 | 
			
		||||
| 
						 | 
				
			
			@ -176,19 +190,6 @@ if [ $ZSH_PRINT_REBOOT_REQUIRED -gt 0 ]; then
 | 
			
		|||
fi
 | 
			
		||||
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
 | 
			
		||||
section "Environment variables"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue