Permalink
Browse files

Clean up setting LOCAL package.target twice

During the config, package.target would be set to ENV['LOCAL'] input
then during the :extract task the package.target would be set again to
ENV['LOCAL'].expanded_path.
Now it's configured during the config process.
  • Loading branch information...
1 parent e47ee05 commit d93ff200670599a1c4e5d4ff2b302fa5d63e591d @Azolo Azolo committed Jun 20, 2012
Showing with 2 additions and 4 deletions.
  1. +2 −2 config/ruby_installer.rb
  2. +0 −1 recipes/interpreter/ruby18.rake
  3. +0 −1 recipes/interpreter/ruby19.rake
View
@@ -104,10 +104,10 @@ module RubyInstaller
# local repository
if ENV['LOCAL'] then
Ruby18.installer_guid = '{12E6FD2D-D425-4E32-B77B-020A15A8346F}'
- Ruby18.target = ENV['LOCAL'].gsub('\\', File::SEPARATOR)
+ Ruby18.target = File.expand_path(ENV['LOCAL'].gsub('\\', File::SEPARATOR))
Ruby19.patches = nil
- Ruby19.target = ENV['LOCAL'].gsub('\\', File::SEPARATOR)
+ Ruby19.target = File.expand_path(ENV['LOCAL'].gsub('\\', File::SEPARATOR))
Ruby19.installer_guid = '{17E73B15-62D2-43FD-B851-ACF86A8C9D25}'
end
@@ -52,7 +52,6 @@ namespace(:interpreter) do
task :extract => [:extract_utils] do
case
when ENV['LOCAL']
- package.target = File.expand_path(File.join(ENV['LOCAL'], '.'))
when ENV['CHECKOUT']
package.target = File.expand_path(package.checkout_target)
else
@@ -53,7 +53,6 @@ namespace(:interpreter) do
task :extract => [:extract_utils] do
case
when ENV['LOCAL']
- package.target = File.expand_path(File.join(ENV['LOCAL'], '.'))
when ENV['CHECKOUT']
package.target = File.expand_path(package.checkout_target)
else

0 comments on commit d93ff20

Please sign in to comment.