Merge pull request #2067 from gaelicWizard/BASH_IT_BASHRC

lib/helpers: eliminate assumptions about login shells

lib/helpers.bash

@@ -654,30 +654,18 @@ function _bash-it-restart() {
 	_about 'restarts the shell in order to fully reload it'
 	_group 'lib'
 
-	local saved_pwd="${PWD}" init_file
+	local saved_pwd="${PWD}" init_file="${BASH_IT_BASHRC:-${HOME?}/.bashrc}"
 
-	if shopt -q login_shell; then
-		init_file=.bash_profile
-	else
-		init_file=.bashrc
-	fi
-	exec "${0/-/}" --rcfile <(echo "source \"$HOME/$init_file\"; cd \"$saved_pwd\"")
+	exec "${0/-/}" --rcfile <(echo "source \"${init_file}\"; cd \"$saved_pwd\"")
 }
 
 function _bash-it-reload() {
 	_about 'reloads a profile file'
 	_group 'lib'
 
 	pushd "${BASH_IT?}" > /dev/null || return
-
 	# shellcheck disable=SC1090
-	if shopt -q login_shell; then
-		# shellcheck source-path=$HOME
-		source ~/.bash_profile
-	else
-		# shellcheck source-path=$HOME
-		source ~/.bashrc
-	fi
+	source "${BASH_IT_BASHRC:-${HOME?}/.bashrc}"
 	popd > /dev/null || return
 }