From 32a184d8c05b0c54b5d9bbbcf7216e1282711d4c Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Wed, 19 Sep 2012 21:40:29 +1200 Subject: [PATCH] '.' => 'source' (some people alias '.' as something different) --- install.sh | 2 +- scm_breeze.sh | 24 ++++++++++++------------ test/lib/design_test.sh | 8 ++++---- test/lib/git/repo_index_test.sh | 8 ++++---- test/lib/git/shell_shortcuts_test.sh | 4 ++-- test/lib/git/status_shortcuts_test.sh | 8 ++++---- test/support/shunit2 | 2 +- 7 files changed, 28 insertions(+), 28 deletions(-) diff --git a/install.sh b/install.sh index bfa99cb..c2e2798 100755 --- a/install.sh +++ b/install.sh @@ -19,7 +19,7 @@ for rc in bashrc zshrc; do done # Load SCM Breeze update scripts -. "$scmbDir/lib/scm_breeze.sh" +source "$scmbDir/lib/scm_breeze.sh" # Create '~/.*.scmbrc' files from example files _create_or_patch_scmbrc diff --git a/scm_breeze.sh b/scm_breeze.sh index 96bd355..98957d5 100644 --- a/scm_breeze.sh +++ b/scm_breeze.sh @@ -8,28 +8,28 @@ export scmbDir="$(dirname ${BASH_SOURCE:-$0})" [ -s "$HOME/.scmbrc" ] && . "$HOME/.scmbrc" # Shared functions -. "$scmbDir/lib/scm_breeze.sh" +source "$scmbDir/lib/scm_breeze.sh" # Design assets management -. "$scmbDir/lib/design.sh" +source "$scmbDir/lib/design.sh" # Git # ------------------------------------------------------------ if [[ -s "$HOME/.git.scmbrc" ]]; then # Load git config - . "$HOME/.git.scmbrc" - . "$scmbDir/lib/git/helpers.sh" - . "$scmbDir/lib/git/aliases.sh" - . "$scmbDir/lib/git/keybindings.sh" - . "$scmbDir/lib/git/status_shortcuts.sh" - . "$scmbDir/lib/git/branch_shortcuts.sh" - . "$scmbDir/lib/git/shell_shortcuts.sh" - . "$scmbDir/lib/git/repo_index.sh" - . "$scmbDir/lib/git/tools.sh" + source "$HOME/.git.scmbrc" + source "$scmbDir/lib/git/helpers.sh" + source "$scmbDir/lib/git/aliases.sh" + source "$scmbDir/lib/git/keybindings.sh" + source "$scmbDir/lib/git/status_shortcuts.sh" + source "$scmbDir/lib/git/branch_shortcuts.sh" + source "$scmbDir/lib/git/shell_shortcuts.sh" + source "$scmbDir/lib/git/repo_index.sh" + source "$scmbDir/lib/git/tools.sh" if ! type ruby > /dev/null 2>&1; then # If Ruby is not installed, fall back to the # slower bash/zsh implementation of 'git_status_shortcuts' - . "$scmbDir/lib/git/fallback/status_shortcuts_shell.sh" + source "$scmbDir/lib/git/fallback/status_shortcuts_shell.sh" fi fi diff --git a/test/lib/design_test.sh b/test/lib/design_test.sh index 0ef4163..4f2becd 100755 --- a/test/lib/design_test.sh +++ b/test/lib/design_test.sh @@ -13,11 +13,11 @@ export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../.." if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit; fi # Load test helpers -. "$scmbDir/test/support/test_helper" +source "$scmbDir/test/support/test_helper" # Load functions to test -. "$scmbDir/lib/scm_breeze.sh" -. "$scmbDir/lib/design.sh" +source "$scmbDir/lib/scm_breeze.sh" +source "$scmbDir/lib/design.sh" # Setup and tear down @@ -83,5 +83,5 @@ test_design() { # load and run shUnit2 # Call this function to run tests -. "$scmbDir/test/support/shunit2" +source "$scmbDir/test/support/shunit2" diff --git a/test/lib/git/repo_index_test.sh b/test/lib/git/repo_index_test.sh index dcf1b0c..5d84a8a 100755 --- a/test/lib/git/repo_index_test.sh +++ b/test/lib/git/repo_index_test.sh @@ -13,11 +13,11 @@ export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../../.." if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit; fi # Load test helpers -. "$scmbDir/test/support/test_helper" +source "$scmbDir/test/support/test_helper" # Load functions to test -. "$scmbDir/lib/scm_breeze.sh" -. "$scmbDir/lib/git/repo_index.sh" +source "$scmbDir/lib/scm_breeze.sh" +source "$scmbDir/lib/git/repo_index.sh" # Setup and tear down @@ -190,5 +190,5 @@ test_changing_to_top_level_directory() { # load and run shUnit2 # Call this function to run tests -. "$scmbDir/test/support/shunit2" +source "$scmbDir/test/support/shunit2" diff --git a/test/lib/git/shell_shortcuts_test.sh b/test/lib/git/shell_shortcuts_test.sh index c564df9..3e076e5 100755 --- a/test/lib/git/shell_shortcuts_test.sh +++ b/test/lib/git/shell_shortcuts_test.sh @@ -20,7 +20,7 @@ else fi # Load test helpers -. "$scmbDir/test/support/test_helper" +source "$scmbDir/test/support/test_helper" # Setup #----------------------------------------------------------------------------- @@ -69,4 +69,4 @@ test_shell_command_wrapping() { # load and run shUnit2 -. "$scmbDir/test/support/shunit2" +source "$scmbDir/test/support/shunit2" diff --git a/test/lib/git/status_shortcuts_test.sh b/test/lib/git/status_shortcuts_test.sh index b7377a3..137ed07 100755 --- a/test/lib/git/status_shortcuts_test.sh +++ b/test/lib/git/status_shortcuts_test.sh @@ -13,11 +13,11 @@ export scmbDir="$( cd -P "$( dirname "$0" )" && pwd )/../../.." if [ -n "${ZSH_VERSION:-}" ]; then shell="zsh"; SHUNIT_PARENT=$0; setopt shwordsplit; fi # Load test helpers -. "$scmbDir/test/support/test_helper" +source "$scmbDir/test/support/test_helper" # Load functions to test -. "$scmbDir/lib/scm_breeze.sh" -. "$scmbDir/lib/git/status_shortcuts.sh" +source "$scmbDir/lib/scm_breeze.sh" +source "$scmbDir/lib/git/status_shortcuts.sh" # Setup and tear down @@ -274,5 +274,5 @@ test_adding_files_with_spaces() { # load and run shUnit2 -. "$scmbDir/test/support/shunit2" +source "$scmbDir/test/support/shunit2" diff --git a/test/support/shunit2 b/test/support/shunit2 index 8862ffd..8ca4b4b 100755 --- a/test/support/shunit2 +++ b/test/support/shunit2 @@ -1015,7 +1015,7 @@ noexec 2>/dev/null || _shunit_fatal \ # we must manually source the tests in standalone mode if [ "${__shunit_mode}" = "${__SHUNIT_MODE_STANDALONE}" ]; then - . "`_shunit_prepForSourcing \"${__shunit_script}\"`" + source "`_shunit_prepForSourcing \"${__shunit_script}\"`" fi # execute the oneTimeSetUp function (if it exists)