From c53a13e0be7ad9f569bee2ce450b875f5abe7de5 Mon Sep 17 00:00:00 2001 From: dmitry kim Date: Fri, 20 Jun 2008 16:24:38 +0400 Subject: * directory independent launch_here.rb: 3rd attempt --- bin/rbot | 51 +-------------------------------------------------- 1 file changed, 1 insertion(+), 50 deletions(-) (limited to 'bin') diff --git a/bin/rbot b/bin/rbot index cee5974a..d2f53eb4 100755 --- a/bin/rbot +++ b/bin/rbot @@ -47,58 +47,9 @@ require 'etc' require 'getoptlong' require 'fileutils' -$version="0.9.11-git" +$version ||= "0.9.11-git" $opts = Hash.new -if $version =~ /git/ - if defined?(SCM_DIR) and File.exists?(File.join(SCM_DIR, '.git')) - begin - git_out = `git status` - git_out.match(/^# On branch (.*)\n/) - if $1 # git 1.5.x - branch = $1.dup || "unknown" - changed = git_out.match(/^# Change(.*)\n/) - rev = "revision " - git_out = `git log -1 --pretty=format:"%h%n%b%n%ct"`.split("\n") - rev << git_out.first - $version_timestamp = git_out.last.to_i - if git_out[1].match(/^git-svn-id: \S+@(\d+)/) - rev << "(svn #{$1})" - end - rev << ", local changes" if changed - else # older gits - git_out = `git branch` - git_out.match(/^\* (.*)\n/) - branch = $1.dup rescue "unknown" - rev = "revision " + `git rev-parse HEAD`[0,6] - end - rescue => e - puts e.inspect - branch = "unknown branch" - rev = "unknown revision" - end - - $version << " (#{branch} branch, #{rev})" - else - up = File.dirname(__FILE__) + "/.." - rev = " (unknown revision)" - begin - svn_out = `svn info #{up}` - if svn_out =~ /Last Changed Rev: (\d+)/ - rev = " (revision #{$1}" - end - svn_st = `svn st #{up}` - if svn_st =~ /^[MDA] / - rev << ", local changes" - end - rev << ")" - rescue => e - puts e.inspect - end if File.directory?(File.join(up, '.svn')) - $version += rev - end -end - orig_opts = ARGV.dup opts = GetoptLong.new( -- cgit v1.2.3