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

Renamed and fixed travis update script, as well as git_ignore function

Browse Source
This commit is contained in:
Nathan Broadbent
2012-01-31 00:52:11 +08:00
parent 89b98eb986
commit 2a2987cc87
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/git/tools.sh
View File

@@ -46,7 +46,7 @@ git_set_default_remote() {
# Usage: git_ignore [rule] [ignore_file=.gitignore] # Usage: git_ignore [rule] [ignore_file=.gitignore]
git_ignore() { git_ignore() {
if [ -n "$2" ]; then local f="$2"; else local f=".gitignore"; fi if [ -n "$2" ]; then local f="$2"; else local f=".gitignore"; fi
if [ -n "$1" ] && [ -e $f ] && ! grep -q "$1" $f; then echo "$1" >> $f; fi if [ -n "$1" ] && ! ([ -e $f ] && grep -q "$1" $f); then echo "$1" >> $f; fi
} }
# Add one git ignore rule, just for your machine # Add one git ignore rule, just for your machine
@@ -122,22 +122,22 @@ fi
# Creates and excludes .travis_status~ # Creates and excludes .travis_status~
# Use with SCM breeze repo index. # Use with SCM breeze repo index.
# Add the following line to your crontab: (updates every 2 minutes) # Add the following line to your crontab: (updates every 2 minutes)
# */2 * * * * /bin/bash -c '. $HOME/.bashrc && git_index --rebuild && git_index --batch-cmd git_update_travis_status' # */2 * * * * /bin/bash -c '. $HOME/.bashrc && git_index --rebuild && git_index --batch-cmd update_travis_ci_status'
# #
git_update_travis_status() { update_travis_ci_status() {
if [ -e ".travis.yml" ]; then if [ -e ".travis.yml" ]; then
if type ruby > /dev/null 2>&1 && type travis > /dev/null 2>&1; then if type ruby > /dev/null 2>&1 && type travis > /dev/null 2>&1; then
# Only use slug from origin # Only use slug from origin
local repo=$(ruby -e "puts %x[cd $base_path && git remote -v].scan(/origin.*(?:\:|\/)([^\:\/]+\/[^\:\/]+)\.git/m).flatten.uniq") local repo=$(ruby -e "puts %x[git remote -v].scan(/origin.*(?:\:|\/)([^\:\/]+\/[^\:\/]+)\.git/m).flatten.uniq")
local travis_output=$(travis repositories --slugs="$repo") local travis_output=$(travis repositories --slugs="$repo")
local stat_file="$base_path/.travis_status~" local stat_file=".travis_status~"
case "$travis_output" in case "$travis_output" in
*Passing*) echo "Passing" > "$stat_file";; *Passing*) echo "Passing" > "$stat_file";;
*Failing*) echo "Failing" > "$stat_file";; *Failing*) echo "Failing" > "$stat_file";;
*Running*) echo "Running" > "$stat_file";; *Running*) echo "Running" > "$stat_file";;
esac esac
git_ignore ".travis_status~" "$base_path/.git/info/exclude" git_ignore ".travis_status~" ".git/info/exclude"
fi fi
fi fi
} }