Merge pull request #6 from nodes-ios/RealmSupport

Doesn't prompt to copy to applications when used with homebrew
ml-archive · Mar 29, 2016 · 7c45a03 · 7c45a03
2 parents 1d794e9 + a9e4cac
commit 7c45a03
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/Carthage/Checkouts/model-generator b/Carthage/Checkouts/model-generator
diff --git a/Model Boiler/Classes/Support/Extensions.swift b/Model Boiler/Classes/Support/Extensions.swift
@@ -34,7 +34,7 @@ extension NSApplication {
     }
 
     func verifyAppInstallLocation() {
-        if !isInApplications() {
+        if !isInApplications() && !isInBrewsFolder() {
 
             let alert = NSAlert()
             alert.addButtonWithTitle("Install in Applications folder")
@@ -72,9 +72,15 @@ extension NSApplication {
 
         return sourcePath == expectedPath
     }
+
+    func isInBrewsFolder() -> Bool {
+        let sourcePath = NSBundle.mainBundle().bundlePath
+
+        return sourcePath.containsString("homebrew-cask/Caskroom")
+    }
 
     func moveToApplicationsIfNecessary() throws {
-        if isInApplications() { return }
+        if isInApplications() || isInBrewsFolder() { return }
 
         let bundle     = NSBundle.mainBundle()
         let sourcePath = bundle.bundlePath

diff --git a/Model Boiler/Classes/User Interface/StatusBarController.swift b/Model Boiler/Classes/User Interface/StatusBarController.swift
@@ -170,7 +170,7 @@ class StatusBarController: NSObject, NSMenuDelegate {
         SettingsManager.setSetting(.OnlyCreateInitializer, enabled: newState)
 
         if let camelCaseItem = optionsMenu.itemWithTag(MenuItem.OnlyCreateInitializer.rawValue) {
-            camelCaseItem.state = newState == true ? NSOffState : NSOnState
+            camelCaseItem.state = newState == true ? NSOnState : NSOffState
         }
     }
 

diff --git a/Model Boiler/Supporting Files/Info.plist b/Model Boiler/Supporting Files/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.1.3</string>
+	<string>2.1.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>13</string>
+	<string>14</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>