Reorganised code

lib/git/aliases_and_bindings.sh

@@ -1,7 +1,7 @@
 #
 # Set up configured aliases & keyboard shortcuts
 # --------------------------------------------------------------------
-# _alias() ignores errors if alias is not defined. (from lib/_shared.sh)
+# _alias() ignores errors if alias is not defined. (from lib/scm_breeze.sh)
 
 _alias $git_alias='git'
 

lib/scm_breeze.sh

@@ -17,6 +17,8 @@ update_scm_breeze() {
   oldHEAD=$(git rev-parse HEAD 2> /dev/null)
   git pull origin master
 
+  source "$scmbDir/lib/scm_breeze.sh"
+
   # Create or attempt to patch '~/.*.scmbrc' files.
   patchfile=$(mktemp)
   for scm in git; do

scm_breeze.sh

@@ -5,7 +5,7 @@
 export scmbDir="$(dirname ${BASH_SOURCE:-$0})"
 
 # Load shared functions.
-. "$scmbDir/lib/_shared.sh"
+. "$scmbDir/lib/scm_breeze.sh"
 
 # Git
 # ------------------------------------------------------------

test/lib/git/repo_index_test.sh

@@ -16,7 +16,7 @@ if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwords
 . "$scmbDir/test/support/test_helper"
 
 # Load functions to test
-. "$scmbDir/lib/_shared.sh"
+. "$scmbDir/lib/scm_breeze.sh"
 . "$scmbDir/lib/git/repo_index.sh"
 
 

test/lib/git/status_shortcuts_test.sh

@@ -17,7 +17,7 @@ if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwords
 . "$scmbDir/test/support/test_helper"
 
 # Load functions to test
-. "$scmbDir/lib/_shared.sh"
+. "$scmbDir/lib/scm_breeze.sh"
 . "$scmbDir/lib/git/status_shortcuts.sh"