X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=launch_here.rb;h=7c4b2a5fcc61c65ee167fae8cf85256fca77648b;hb=531dc9cab1bb7c22833740ebcec2acd1fd99363e;hp=7bc21c805ad0227c0941545feb2ddf163c457e5b;hpb=be338a99e9bfdc2f196fbcfb391c2e6003231dea;p=user%2Fhenk%2Fcode%2Fruby%2Frbot.git

diff --git a/launch_here.rb b/launch_here.rb
index 7bc21c80..7c4b2a5f 100755
--- a/launch_here.rb
+++ b/launch_here.rb
@@ -1,4 +1,4 @@
-#!/usr/bin/ruby
+#!/usr/bin/env ruby
 #
 # Load rbot from this directory. (No need to install it with setup.rb)
 #
@@ -8,7 +8,7 @@ puts "Running from #{SCM_DIR}"
 
 $:.unshift File.join(SCM_DIR, 'lib')
 
-$version = '0.9.15-git'
+$version = '0.9.15'
 
 pwd = Dir.pwd
 begin
@@ -16,14 +16,14 @@ begin
 
   if File.exists? '.git'
     begin
-      git_out = `git log -1 --pretty=format:"%H%n%s%n%ct" | git name-rev --stdin`.split("\n")
-      $version_timestamp = git_out.last.to_i
-      subject = git_out[1].strip
+      git_out = `git log -1 --pretty=raw | git name-rev --stdin`.split("\n")
+      commit, branch_spec = git_out.first.scan(/^commit (\S+)(?: \((\S+)\))?$/).first
+      $version_timestamp = git_out[4].split[-2].to_i
+      subject = git_out[6].strip rescue ""
       subject[77..-1] = "..." if subject.length > 80
-      commit, branch_spec = git_out.first.scan(/^(\S+)(?: \((\S+)\))?$/).first
       rev = "revision #{commit[0,7]}"
       rev << " [#{subject}]" unless subject.empty?
-      changes = `git diff --shortstat HEAD`.split(", ").first
+      changes = `git diff-index --stat HEAD`.split("\n").last.split(", ").first rescue nil
       rev << ", #{changes.strip}" if changes
       if branch_spec
         tag, branch, offset = branch_spec.scan(/^(?:(tag)s\/)?(\S+?)(?:^0)?(?:~(\d+))?$/).first