Commit 549f113930b5332ce74cb0c2494394c743b41d07
1 parent
c3808d88b6
Don't die if HEAD ref is not symbolic.
Examples of situations when HEAD is not symbolic: * You're doing interactive rebase * You're using git bisect * ... and so on.
Showing 1 changed file with 5 additions and 2 deletions Inline Diff
script/boxen
| #!/usr/bin/ruby | 1 | 1 | #!/usr/bin/ruby | |
| # Run Boxen. | 2 | 2 | # Run Boxen. | |
| 3 | 3 | |||
| require "pathname" | 4 | 4 | require "pathname" | |
| 5 | 5 | |||
| if ENV["USER"] == "root" | 6 | 6 | if ENV["USER"] == "root" | |
| abort "Run this as a normal user, I'll sudo if I need to." | 7 | 7 | abort "Run this as a normal user, I'll sudo if I need to." | |
| end | 8 | 8 | end | |
| 9 | 9 | |||
| # Make sure only one boxen process runs at a time. | 10 | 10 | # Make sure only one boxen process runs at a time. | |
| 11 | 11 | |||
| myself = File.new __FILE__ | 12 | 12 | myself = File.new __FILE__ | |
| 13 | 13 | |||
| unless myself.flock File::LOCK_EX | File::LOCK_NB | 14 | 14 | unless myself.flock File::LOCK_EX | File::LOCK_NB | |
| abort "You're already running a boxen process! Know a patience." | 15 | 15 | abort "You're already running a boxen process! Know a patience." | |
| end | 16 | 16 | end | |
| 17 | 17 | |||
| # Yeah yeah, I like to be explicit. | 18 | 18 | # Yeah yeah, I like to be explicit. | |
| 19 | 19 | |||
| at_exit { myself.flock File::LOCK_UN } | 20 | 20 | at_exit { myself.flock File::LOCK_UN } | |
| 21 | 21 | |||
| # Put us where we belong, in the root dir of our boxen repo. | 22 | 22 | # Put us where we belong, in the root dir of our boxen repo. | |
| 23 | 23 | |||
| Dir.chdir Pathname.new(__FILE__).realpath + "../.." | 24 | 24 | Dir.chdir Pathname.new(__FILE__).realpath + "../.." | |
| 25 | 25 | |||
| # Auto-update code. This is done as early as possible so that changes | 26 | 26 | # Auto-update code. This is done as early as possible so that changes | |
| # to boxen support code or dependencies can be grabbed. | 27 | 27 | # to boxen support code or dependencies can be grabbed. | |
| 28 | 28 | |||
| unless ENV["BOXEN_NO_PULL"] || ARGV.include?("--no-pull") | 29 | 29 | unless ENV["BOXEN_NO_PULL"] || ARGV.include?("--no-pull") | |
| quietly = "> /dev/null 2>&1" | 30 | 30 | quietly = "> /dev/null 2>&1" | |
| 31 | 31 | |||
| if system("which git > /dev/null") && File.directory?(".git") \ | 32 | 32 | if system("which git > /dev/null") && File.directory?(".git") \ | |
| && fetch = system("git fetch -q origin") | 33 | 33 | && fetch = system("git fetch -q origin") | |
| 34 | 34 | |||
| clean = `git status --porcelain`.empty? | 35 | 35 | clean = `git status --porcelain`.empty? | |
| current_branch = `git symbolic-ref HEAD`.chomp | 36 | 36 | current_branch = `git symbolic-ref HEAD`.chomp | |
| master = current_branch == "refs/heads/master" | 37 | 37 | master = current_branch == "refs/heads/master" | |
| 38 | 38 | |||
| upstream_changes = `git rev-list --count master..origin/master`.chomp != '0' | 39 | 39 | upstream_changes = `git rev-list --count master..origin/master`.chomp != '0' | |
| fast_forwardable = `git rev-list --count origin/master..master`.chomp == '0' | 40 | 40 | fast_forwardable = `git rev-list --count origin/master..master`.chomp == '0' | |
| 41 | 41 | |||
| short_branch = current_branch.split('/')[2..-1].join('/') | 42 | |||
| 43 | ||||
| if !master | 44 | 42 | if !master | |
| 43 | short_branch = if current_branch.empty? | |||
| 44 | `git log -1 --pretty=format:%h` | |||
| 45 | else | |||
| 46 | current_branch.split('/')[2..-1].join('/') | |||
| 47 | end | |||
| warn "Boxen on a non-master branch '#{short_branch}', won't auto-update!" | 45 | 48 | warn "Boxen on a non-master branch '#{short_branch}', won't auto-update!" | |
| elsif !fast_forwardable | 46 | 49 | elsif !fast_forwardable | |
| warn "Boxen's master branch is out of sync, won't auto-update!" | 47 | 50 | warn "Boxen's master branch is out of sync, won't auto-update!" | |
| elsif !clean | 48 | 51 | elsif !clean | |
| warn "Boxen has a dirty tree, won't auto-update!" | 49 | 52 | warn "Boxen has a dirty tree, won't auto-update!" | |
| elsif !upstream_changes | 50 | 53 | elsif !upstream_changes | |
| warn "Boxen is up-to-date." | 51 | 54 | warn "Boxen is up-to-date." | |
| end | 52 | 55 | end | |
| 53 | 56 |