more name fixes
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
# --------------------------------------------------------------------
|
||||
git_status_shortcuts() {
|
||||
# Run ruby script, store output
|
||||
cmd_output=$(/usr/bin/env ruby "$gitbreezeDir/lib/git/status_shortcuts.rb" $@)
|
||||
cmd_output=$(/usr/bin/env ruby "$scmbreezeDir/lib/git/status_shortcuts.rb" $@)
|
||||
if [[ -z "$cmd_output" ]]; then
|
||||
# Just show regular git status if ruby script returns nothing.
|
||||
git status; return 1
|
||||
|
||||
@@ -1,24 +1,23 @@
|
||||
#
|
||||
# Get directory of this file (for bash and zsh).
|
||||
# git_breeze.sh must not be run directly.
|
||||
# It must be sourced, e.g "source ~/.git_breeze/git_breeze.sh"
|
||||
# scm_breeze.sh must be sourced, and not executed in a sub-shell.
|
||||
# e.g "source ~/.scm_breeze/scm_breeze.sh"
|
||||
# ------------------------------------------------------------
|
||||
|
||||
export gitbreezeDir="$(dirname ${BASH_SOURCE:-$0})"
|
||||
export scmbreezeDir="$(dirname ${BASH_SOURCE:-$0})"
|
||||
|
||||
# Load config
|
||||
. "$HOME/.git.scmbrc"
|
||||
|
||||
. "$gitbreezeDir/lib/_shared.sh"
|
||||
. "$gitbreezeDir/lib/git/aliases_and_bindings.sh"
|
||||
. "$gitbreezeDir/lib/git/status_shortcuts.sh"
|
||||
. "$gitbreezeDir/lib/git/repo_management.sh"
|
||||
. "$gitbreezeDir/lib/git/tools.sh"
|
||||
. "$scmbreezeDir/lib/_shared.sh"
|
||||
. "$scmbreezeDir/lib/git/aliases_and_bindings.sh"
|
||||
. "$scmbreezeDir/lib/git/status_shortcuts.sh"
|
||||
. "$scmbreezeDir/lib/git/repo_management.sh"
|
||||
. "$scmbreezeDir/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'
|
||||
. "$gitbreezeDir/lib/git/fallback/status_shortcuts_shell.sh"
|
||||
. "$scmbreezeDir/lib/git/fallback/status_shortcuts_shell.sh"
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user