Use ZDOTDIR env variable for path to .zshrc
.zshrc can be found at "~/.zshrc", when ZDOTDIR is not set.
If ZDOTDIR is set, .zshrc is in "${ZDOTDIR}/.zshrc".
Using parameter expansion, the hardcoded path can be replaced with
"${ZDOTDIR:-$HOME}/.zshrc". That way, it'll use the value in
ZDOTDIR when set and the value in HOME when not.
This thus mirrors the usage of ZDOTDIR in zsh and makes the code
more fexible.
This commit is contained in:
20
install.sh
20
install.sh
@@ -10,10 +10,10 @@ fi
|
||||
# This loads SCM Breeze into the shell session.
|
||||
exec_string="[ -s \"$HOME/.scm_breeze/scm_breeze.sh\" ] && source \"$HOME/.scm_breeze/scm_breeze.sh\""
|
||||
|
||||
# Add line to bashrc, zshrc, and bash_profile if not already present.
|
||||
# Add line to bashrc and bash_profile if not already present.
|
||||
added_to_profile=false
|
||||
already_present=false
|
||||
for rc in bashrc zshrc bash_profile; do
|
||||
for rc in bashrc bash_profile; do
|
||||
if [ -s "$HOME/.$rc" ]; then
|
||||
if grep -q "$exec_string" "$HOME/.$rc"; then
|
||||
printf "== Already installed in '~/.$rc'\n"
|
||||
@@ -26,13 +26,27 @@ for rc in bashrc zshrc bash_profile; do
|
||||
fi
|
||||
done
|
||||
|
||||
# Add line to .zshrc if not aleady present.
|
||||
# When set, the ZDOTDIR environment variable states the directory zshrc is in.
|
||||
# If not set, HOME environment variable is used as fallback.
|
||||
if [ -s "${ZDOTDIR:-$HOME}/.zshrc" ]; then
|
||||
if grep -q "$exec_string" "${ZDOTDIR:-$HOME}/.zshrc"; then
|
||||
printf "== Already installed in '${ZDOTDIR:-$HOME}/.zshrc'\n"
|
||||
already_present=true
|
||||
else
|
||||
printf "\n$exec_string\n" >> "${ZDOTDIR:-$HOME}/.zshrc"
|
||||
printf "== Added SCM Breeze to '${ZDOTDIR:-$HOME}/.zshrc'\n"
|
||||
already_present=true
|
||||
fi
|
||||
fi
|
||||
|
||||
# Load SCM Breeze update scripts
|
||||
source "$scmbDir/lib/scm_breeze.sh"
|
||||
# Create '~/.*.scmbrc' files from example files
|
||||
_create_or_patch_scmbrc
|
||||
|
||||
if [ "$added_to_profile" = true ] || [ "$already_present" = true ]; then
|
||||
echo "== SCM Breeze Installed! Run 'source ~/.bashrc || source ~/.bash_profile' or 'source ~/.zshrc'"
|
||||
echo "== SCM Breeze Installed! Run 'source ~/.bashrc || source ~/.bash_profile' or 'source \"${ZDOTDIR:-$HOME}/.zshrc\"'"
|
||||
echo " to load SCM Breeze into your current shell."
|
||||
else
|
||||
echo "== Error:"
|
||||
|
||||
Reference in New Issue
Block a user