Permalink
Browse files

remove the ASW tags since we're submitting this as a pull request to …

…andy
  • Loading branch information...
1 parent 4ba453f commit 0a3051349a6c9d3b614b5100326e49198ce3bc00 @rudyrichter rudyrichter committed May 23, 2012
Showing with 1 addition and 9 deletions.
  1. +1 −9 SUDiskImageUnarchiver.m
View
@@ -49,19 +49,15 @@ - (void)extractDMG
}
while (noErr == FSPathMakeRefWithOptions((UInt8 *)[mountPoint fileSystemRepresentation], kFSPathMakeRefDoNotFollowLeafSymlink, &tmpRef, NULL));
-/* ASW_ADDITION */
-#pragma mark ASW_ADDITION
BOOL isEncrypted = NO;
NSData *result = [NTSynchronousTask task:@"/usr/bin/hdiutil" directory:@"/" withArgs:[NSArray arrayWithObjects: @"isencrypted", archivePath, nil] input:NULL];
if([self isEncrypted:result])
isEncrypted = YES;
-/* ASW_ADDITION */
NSArray* arguments = [NSArray arrayWithObjects:@"attach", archivePath, @"-mountpoint", mountPoint, /*@"-noverify",*/ @"-nobrowse", @"-noautoopen", nil];
// set up a pipe and push "yes" (y works too), this will accept any license agreement crap
// not every .dmg needs this, but this will make sure it works with everyone
-/* ASW_ADDITION */
-#pragma mark ASW_ADDITION
+
NSData* promptData;
if(isEncrypted) {
SUPasswordPrompt *prompt = [[SUPasswordPrompt alloc] initWithHost:(SUHost*)[delegate host]];
@@ -83,7 +79,6 @@ - (void)extractDMG
}
else
promptData = [NSData dataWithBytes:"yes\n" length:4];
-/* ASW_ADDITION */
NSData *output = nil;
NSInteger taskResult = -1;
@@ -178,8 +173,6 @@ + (void)load
[self registerImplementation:self];
}
-/* ASW_ADDITION */
-#pragma mark ASW_ADDITION
- (BOOL)isEncrypted:(NSData*)resultData
{
BOOL result = NO;
@@ -193,6 +186,5 @@ - (BOOL)isEncrypted:(NSData*)resultData
}
return result;
}
-/* ASW_ADDITION */
@end

0 comments on commit 0a30513

Please sign in to comment.