Reorganised code

This commit is contained in:
Nathan Broadbent
2011-10-19 18:04:54 +08:00
parent c5c5d5d547
commit 72dec92d35
5 changed files with 6 additions and 4 deletions

View File

@@ -1,7 +1,7 @@
# #
# Set up configured aliases & keyboard shortcuts # 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' _alias $git_alias='git'

View File

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

View File

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

View File

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

View File

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