From bf5d50fcb856502fe825dbe4a92717465ec59ee3 Mon Sep 17 00:00:00 2001 From: Andrew Lorente Date: Thu, 20 Oct 2011 11:27:31 -0700 Subject: [PATCH] Remove restrictions on directory for scm-breeze Previously the script had to be installed to ~/.scm_breeze. Now it can live anywhere! --- install.sh | 7 +++++-- lib/scm_breeze.sh | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/install.sh b/install.sh index 7035d68..3d8ff60 100755 --- a/install.sh +++ b/install.sh @@ -1,6 +1,9 @@ #!/bin/bash + +#locate the dir where this script is stored +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 diff --git a/lib/scm_breeze.sh b/lib/scm_breeze.sh index 9176bea..35da743 100644 --- a/lib/scm_breeze.sh +++ b/lib/scm_breeze.sh @@ -30,7 +30,7 @@ _create_or_patch_scmbrc() { for scm in git; do # Create file from example if it doesn't already exist if ! [ -e "$HOME/.$scm.scmbrc" ]; then - cp "$HOME/.scm_breeze/$scm.scmbrc.example" "$HOME/.$scm.scmbrc" + cp "$scmbDir/$scm.scmbrc.example" "$HOME/.$scm.scmbrc" echo "== '~/.$scm.scmbrc' has been created. Please edit this file to change SCM Breeze settings for '$scm'." # If file exists, attempt to update it with any new settings elif [ -n "$1" ]; then