Browse files

Some oneiric build fixes

  • Loading branch information...
1 parent 50bd038 commit 8b0b84514275a5cc8cd8486354d696d8355b0b68 @EugeneBrazwick committed Mar 16, 2012
Showing with 3 additions and 3 deletions.
  1. +1 −1 bin/reform_launcher.rb
  2. +2 −2 lib/reform/prelims.rb
View
2 bin/reform_launcher.rb
@@ -19,7 +19,7 @@
prelims.check_installation
# It is also tempting to say `exec $RUBY $PWD/gui/mainform.rb &`
# Otherwise we get a stuck terminal.... So:
- if !File::exists?(ARGV[0]) && ARGV[0][-3, 3] != '.rb'
+ if ARGV[0] && !File::exists?(ARGV[0]) && ARGV[0][-3, 3] != '.rb'
spawn ENV['RUBY'], ARGV[0] + '.rb', *(ARGV[1..-1])
else
spawn ENV['RUBY'], *ARGV
View
4 lib/reform/prelims.rb
@@ -68,7 +68,7 @@ def check_installation
class LinguisticsGem < Package
public
def check_reqs
- @prelims.check_gem(nil, 'linguistics', prelims.project)
+ @prelims.check_gem(nil, 'linguistics', @prelims.project)
end
end
@@ -237,7 +237,7 @@ def initialize(project, *packages)
ENV['RUBY'] ||= 'ruby'
@project = project
@packager = MyPackager.new(self)
- @packages = packages.map { |packklass| packklass.new }
+ @packages = packages.map { |packklass| packklass.new(self) }
@uihandler = UIHandler.new
# puts "ASSIGNING @uihandler"
@gemcmd = @rakecmd = nil

0 comments on commit 8b0b845

Please sign in to comment.