Skip to content

Commit

Permalink
Merge branch 'hotfix-1.4.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
chriswayoub committed May 12, 2014
2 parents 157b599 + 847a498 commit ea19231
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions Vagrant Manager/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -859,7 +859,7 @@ - (void)checkForUpdates:(BOOL)displayResult {
- (VirtualMachineInfo*)getNFSVirtualMachineInfo:(NSString*)uuid NFSPath:(NSString*)NFSPath {
NSTask *task = [[NSTask alloc] init];
[task setLaunchPath:@"/bin/bash"];
[task setArguments:@[@"-c", [NSString stringWithFormat:@"vboxmanage showvminfo %@ --machinereadable", uuid]]];
[task setArguments:@[@"-c", [NSString stringWithFormat:@"VBoxManage showvminfo %@ --machinereadable", uuid]]];

NSPipe *pipe = [NSPipe pipe];
[task setStandardInput:[NSPipe pipe]];
Expand All @@ -885,7 +885,7 @@ - (VirtualMachineInfo*)getNFSVirtualMachineInfo:(NSString*)uuid NFSPath:(NSStrin
- (VirtualMachineInfo*)getVirtualMachineInfo:(NSString*)uuid {
NSTask *task = [[NSTask alloc] init];
[task setLaunchPath:@"/bin/bash"];
[task setArguments:@[@"-c", [NSString stringWithFormat:@"vboxmanage showvminfo %@ --machinereadable", uuid]]];
[task setArguments:@[@"-c", [NSString stringWithFormat:@"VBoxManage showvminfo %@ --machinereadable", uuid]]];

NSPipe *pipe = [NSPipe pipe];
[task setStandardInput:[NSPipe pipe]];
Expand All @@ -911,9 +911,9 @@ - (NSArray*)getAllVirtualMachinesInfo {
[task setLaunchPath:@"/bin/bash"];

if ([[NSFileManager defaultManager] isReadableFileAtPath:@"/etc/exports"]) {
[task setArguments:@[@"-c", @"vboxmanage list vms | grep -Eo '[^ ]+$' | sed -e 's/[{}]//g' | grep -vFf <(cat /etc/exports | grep 'VAGRANT' | grep -Eo '[^ ]+$' | uniq)"]];
[task setArguments:@[@"-c", @"VBoxManage list vms | grep -Eo '[^ ]+$' | sed -e 's/[{}]//g' | grep -vFf <(cat /etc/exports | grep 'VAGRANT' | grep -Eo '[^ ]+$' | uniq)"]];
} else {
[task setArguments:@[@"-c", @"vboxmanage list vms | grep -Eo '[^ ]+$' | sed -e 's/[{}]//g'"]];
[task setArguments:@[@"-c", @"VBoxManage list vms | grep -Eo '[^ ]+$' | sed -e 's/[{}]//g'"]];
}


Expand Down
4 changes: 2 additions & 2 deletions Vagrant Manager/Vagrant Manager-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.1</string>
<string>1.4.2</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>6</string>
<string>7</string>
<key>Configuration</key>
<string>${CONFIGURATION}</string>
<key>LSApplicationCategoryType</key>
Expand Down

0 comments on commit ea19231

Please sign in to comment.