Merge remote branch 'beef/master'
Conflicts: install.sh lib/scm_breeze.sh
This commit is contained in:
@@ -1,6 +1,9 @@
|
||||
#!/bin/sh
|
||||
|
||||
#locate the dir where this script is stored
|
||||
export scmbDir="$(dirname "$0")"
|
||||
# This loads SCM Breeze into the shell session.
|
||||
exec_string='[ -s "$HOME/.scm_breeze/scm_breeze.sh" ] && . "$HOME/.scm_breeze/scm_breeze.sh"'
|
||||
exec_string="[ -s \"$scmbDir/scm_breeze.sh\" ]] && . \"$scmbDir/scm_breeze.sh\""
|
||||
|
||||
# Add line to bashrc and zshrc if not already present.
|
||||
for rc in bashrc zshrc; do
|
||||
@@ -11,7 +14,7 @@ for rc in bashrc zshrc; do
|
||||
done
|
||||
|
||||
# Load SCM Breeze update scripts
|
||||
. "$HOME/.scm_breeze/lib/scm_breeze.sh"
|
||||
. "$scmbDir/lib/scm_breeze.sh"
|
||||
# Create '~/.*.scmbrc' files from example files
|
||||
_create_or_patch_scmbrc
|
||||
|
||||
|
||||
Reference in New Issue
Block a user