flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more name fixes

Browse Source
This commit is contained in:
Nathan Broadbent
2011-10-18 00:21:38 +08:00
parent 0feae2a46e
commit 1dde08e904
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/git/status_shortcuts.sh
View File

@@ -18,7 +18,7 @@
# -------------------------------------------------------------------- # --------------------------------------------------------------------
git_status_shortcuts() { git_status_shortcuts() {
# Run ruby script, store output # 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 if [[ -z "$cmd_output" ]]; then
# Just show regular git status if ruby script returns nothing. # Just show regular git status if ruby script returns nothing.
git status; return 1 git status; return 1

19
scm_breeze.sh
View File

@@ -1,24 +1,23 @@
# #
# Get directory of this file (for bash and zsh). # scm_breeze.sh must be sourced, and not executed in a sub-shell.
# git_breeze.sh must not be run directly. # e.g "source ~/.scm_breeze/scm_breeze.sh"
# It must be sourced, e.g "source ~/.git_breeze/git_breeze.sh"
# ------------------------------------------------------------ # ------------------------------------------------------------
export gitbreezeDir="$(dirname ${BASH_SOURCE:-$0})" export scmbreezeDir="$(dirname ${BASH_SOURCE:-$0})"
# Load config # Load config
. "$HOME/.git.scmbrc" . "$HOME/.git.scmbrc"
. "$gitbreezeDir/lib/_shared.sh" . "$scmbreezeDir/lib/_shared.sh"
. "$gitbreezeDir/lib/git/aliases_and_bindings.sh" . "$scmbreezeDir/lib/git/aliases_and_bindings.sh"
. "$gitbreezeDir/lib/git/status_shortcuts.sh" . "$scmbreezeDir/lib/git/status_shortcuts.sh"
. "$gitbreezeDir/lib/git/repo_management.sh" . "$scmbreezeDir/lib/git/repo_management.sh"
. "$gitbreezeDir/lib/git/tools.sh" . "$scmbreezeDir/lib/git/tools.sh"
if ! type ruby > /dev/null 2>&1; then if ! type ruby > /dev/null 2>&1; then
# If Ruby is not installed, fall back to the # If Ruby is not installed, fall back to the
# slower bash/zsh implementation of 'git_status_shortcuts' # 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 fi