Merge branch 'release/1.5.4'

lanayotech · Jun 17, 2014 · afc1264 · afc1264
2 parents cf53814 + 28b8f2d
commit afc1264
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/Vagrant Manager/AppDelegate.m b/Vagrant Manager/AppDelegate.m
@@ -250,7 +250,7 @@ - (void)runVagrantAction:(NSString*)action withObject:(id)obj {
         bookmark = obj;
     }
 
-    NSString *taskCommand = [NSString stringWithFormat:@"cd %@ && %@", bookmark ? [Util escapeShellArg:bookmark.path] : [Util escapeShellArg:[machine getSharedFolderPathWithName:@"/vagrant"]], command];
+    NSString *taskCommand = [NSString stringWithFormat:@"cd %@; %@", bookmark ? [Util escapeShellArg:bookmark.path] : [Util escapeShellArg:[machine getSharedFolderPathWithName:@"/vagrant"]], command];
 
     [task setArguments:@[@"-c", taskCommand]];
 
@@ -419,7 +419,7 @@ - (void)rebuildMenu:(BOOL)closeMenu {
         [statusMenu addItem:refreshDetectedMenuItem];
 
         [statusMenu addItem:[NSMenuItem separatorItem]];
-        
+
         if(!manageBookmarksMenuItem) {
             manageBookmarksMenuItem = [[NSMenuItem alloc] init];
             manageBookmarksMenuItem.title = @"Manage Bookmarks";
@@ -611,7 +611,7 @@ - (IBAction)preferencesMenuItemClicked:(id)sender {
 - (void)vagrantSshMenuItemClicked:(NSMenuItem*)menuItem {
     VirtualMachineInfo* machine = [self getMachineFromObject:menuItem.parentItem.representedObject];
     if(machine) {
-        NSString *action = [NSString stringWithFormat:@"cd %@ && vagrant ssh", [Util escapeShellArg:[machine getSharedFolderPathWithName:@"/vagrant"]]];
+        NSString *action = [NSString stringWithFormat:@"cd %@; vagrant ssh", [Util escapeShellArg:[machine getSharedFolderPathWithName:@"/vagrant"]]];
         [self runTerminalCommand:action];
     }
 }
@@ -819,7 +819,7 @@ - (void)removeInfoWindow:(VirtualMachineInfoWindow*)infoWindow {
 
 - (NSString*)getCurrentTheme {
     NSString *theme = [[NSUserDefaults standardUserDefaults] objectForKey:@"statusBarIconTheme"];
-    
+
     NSArray *validThemes = @[@"default",
                            @"clean",
                            @"flat"];
@@ -962,9 +962,9 @@ - (void)updaterDidNotFindUpdate:(SUUpdater *)update {
 
 - (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUUpdater *)bundle {
     SUAppcastItem *bestItem = nil;
-    
+
     NSString *appVersion = [[NSBundle mainBundle] objectForInfoDictionaryKey:@"CFBundleShortVersionString"];
-    
+
     for(SUAppcastItem *item in [appcast items]) {
         if([Util compareVersion:appVersion toVersion:item.versionString] == NSOrderedAscending) {
             if([Util getUpdateStabilityScore:[Util getVersionStability:item.versionString]] <= [Util getUpdateStabilityScore:[Util getUpdateStability]]) {
@@ -974,7 +974,7 @@ - (SUAppcastItem *)bestValidUpdateInAppcast:(SUAppcast *)appcast forUpdater:(SUU
             }
         }
     }
-    
+
     return bestItem;
 }
 

diff --git a/Vagrant Manager/TaskOutputWindow.m b/Vagrant Manager/TaskOutputWindow.m
@@ -100,7 +100,9 @@ - (void)receivedOutput:(NSNotification*)notif {
         [self.outputTextView scrollRangeToVisible: NSMakeRange(self.outputTextView.string.length, 0)];
     }
 
-    [fh waitForDataInBackgroundAndNotify];
+    if(self.task.isRunning) {
+        [fh waitForDataInBackgroundAndNotify];
+    }
 }
 
 - (IBAction)closeButtonClicked:(id)sender {

diff --git a/Vagrant Manager/Vagrant Manager-Info.plist b/Vagrant Manager/Vagrant Manager-Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.5.3</string>
+	<string>1.5.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.3</string>
+	<string>1.5.4</string>
 	<key>Configuration</key>
 	<string>${CONFIGURATION}</string>
 	<key>LSApplicationCategoryType</key>