Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Refactor a bit of the bootstrapper to fix a bug with the UI if homebr…

…ew needed to be installed but we weren't installing from source
  • Loading branch information...
commit 2adb7a0eb8bf15d145c0637ec2091e3eca9b4f34 1 parent c097588
Jeremy McAnally jm authored
10,347 Railcar.xcodeproj/project.xcworkspace/xcuserdata/jeremymcanally.xcuserdatad/UserInterfaceState.xcuserstate
View
7,023 additions, 3,324 deletions not shown
21 Railcar.xcodeproj/xcuserdata/jeremymcanally.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
View
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+ type = "1"
+ version = "1.0">
+ <FileBreakpoints>
+ <FileBreakpoint
+ shouldBeEnabled = "Yes"
+ ignoreCount = "0"
+ continueAfterRunningActions = "No"
+ isPathRelative = "1"
+ filePath = "Railcar/RCApplicationManager.rb"
+ timestampString = "356998242.092546"
+ startingColumnNumber = "9223372036854775807"
+ endingColumnNumber = "9223372036854775807"
+ startingLineNumber = "11"
+ endingLineNumber = "11"
+ landmarkName = "applications"
+ landmarkType = "7">
+ </FileBreakpoint>
+ </FileBreakpoints>
+</Bucket>
8 Railcar/RCBootstrapper.rb
View
@@ -10,7 +10,11 @@ def installDependencies(fromSource = true)
puts("starting")
if needsInstall?
begin
- checkForCompiler if buildFromSource?
+ if buildFromSource?
+ checkForCompiler
+ else
+ delegate.noCompilerNeeded
+ end
if needsBrew?
installBrew
@@ -64,6 +68,8 @@ def installBrew
puts("installing brew")
pathToScript = NSBundle.mainBundle.pathForResource('install_brew', ofType:"sh")
+ FileUtils.mkdir_p(File.join(NSBundle.mainBundle.bundlePath, "homebrew"))
+
`/bin/sh #{pathToScript} #{BREW_DOWNLOAD_URL} #{NSBundle.mainBundle.bundlePath}`
raise "Brew install failed!" if ($?.exitstatus > 0)
7 Railcar/RCSetupWindowController.rb
View
@@ -24,6 +24,13 @@ def compilerExists
progressBar.incrementBy 10.0
end
+
+ def noCompilerNeeded
+ highlight(brewTitle, brewInfo)
+ brewTitle.setStringValue "Installing Homebrew"
+
+ progressBar.incrementBy 10.0
+ end
def brewInstalled
fade(brewTitle, brewInfo)
1  Railcar/install_brew.sh
View
@@ -5,6 +5,5 @@
#
# Created by Jeremy McAnally on 3/29/12.
# Copyright (c) 2012 Arcturo. All rights reserved.
-mkdir $2/homebrew
cd $2
curl -L $1 | tar xz --strip 1 -C homebrew
Please sign in to comment.
Something went wrong with that request. Please try again.