svn commit: r787489 - in /buildr/trunk/lib/buildr: core/shell.rb groovy/shell.rb

[djspiewak]

Author: djspiewak
Date: Tue Jun 23 00:07:42 2009
New Revision: 787489

URL: http://svn.apache.org/viewvc?rev=787489&view=rev
Log:
Replaced / with #{File::SEPARATOR}

Modified:
    buildr/trunk/lib/buildr/core/shell.rb
    buildr/trunk/lib/buildr/groovy/shell.rb

Modified: buildr/trunk/lib/buildr/core/shell.rb
URL: 
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/shell.rb?rev=787489&r1=787488&r2=787489&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/shell.rb (original)
+++ buildr/trunk/lib/buildr/core/shell.rb Tue Jun 23 00:07:42 2009
@@ -49,10 +49,10 @@
           props['jruby.shell'] = if Utils.win_os? then 'cmd.exe' else 
'/bin/sh' end
           
           args = [
-            "-Xbootclasspath/a:#{Dir.glob(jruby_home + '/lib/jruby*.jar').join 
File::PATH_SEPARATOR}"
+            
"-Xbootclasspath/a:#{Dir.glob("#{jruby_home}#{File::SEPARATOR}lib#{File::SEPARATOR}jruby*.jar").join
 File::PATH_SEPARATOR}"
           ]
           
-          Java::Commands.java 'org.jruby.Main', "#{jruby_home}/bin/jirb", {
+          Java::Commands.java 'org.jruby.Main', 
"#{jruby_home}#{File::SEPARATOR}bin#{File::SEPARATOR}jirb", {
             :properties => props.merge(rebel_props project),
             :classpath => cp,
             :java_args => args + rebel_args

Modified: buildr/trunk/lib/buildr/groovy/shell.rb
URL: 
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/groovy/shell.rb?rev=787489&r1=787488&r2=787489&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/groovy/shell.rb (original)
+++ buildr/trunk/lib/buildr/groovy/shell.rb Tue Jun 23 00:07:42 2009
@@ -19,7 +19,7 @@
         
         cmd_args = " -classpath '#{cp}'"
         trace "groovysh #{cmd_args}"
-        system(File.expand_path('bin/groovysh' + SUFFIX, groovy_home) + 
cmd_args)
+        system(File.expand_path("bin#{File::SEPARATOR}groovysh#{SUFFIX}", 
groovy_home) + cmd_args)
       end
       
     private