Merge branch 'master' of https://github.com/sveinbjornt/Platypus

Author: sveinbjornt

Shared/NSFileManager+TempFiles.m

@@ -41,12 +41,18 @@ - (NSString *)createTempFileNamed:(NSString *)fileName withContents:(NSString *)
     // http://cocoawithlove.com/2009/07/temporary-files-and-folders-in-cocoa.html
 
     NSString *tmpFileNameTemplate = fileName ? fileName : @"tmp_file_platypus_macos.XXXXXX";
+    // Allow user to override the temporary directory by setting the TMPDIR environment variable
     NSString *tmpDir = NSTemporaryDirectory();
-    if (!tmpDir) {
-        NSLog(@"NSTemporaryDirectory() returned nil");
-        return nil;
+    char *tmpdir_cstring = getenv("TMPDIR");
+    if (tmpdir_cstring != NULL && strlen(tmpdir_cstring) > 0) {
+      tmpDir = [NSString stringWithUTF8String:tmpdir_cstring];
+    } else {
+      if (!tmpDir) {
+          NSLog(@"NSTemporaryDirectory() returned nil");
+          return nil;
+      }
     }
-    
+
     NSString *tempFileTemplate = [tmpDir stringByAppendingPathComponent:tmpFileNameTemplate];
     const char *tempFileTemplateCString = [tempFileTemplate fileSystemRepresentation];
     char *tempFileNameCString = (char *)malloc(strlen(tempFileTemplateCString) + 1);

Shared/PlatypusAppSpec.m

@@ -260,11 +260,17 @@ - (BOOL)create {
     // .app bundle
     // Get temporary directory, make sure it's kosher. Apparently NSTemporaryDirectory() can return nil
     // See http://www.cocoadev.com/index.pl?NSTemporaryDirectory
+    // Allow user to override the temporary directory by setting the TMPDIR environment variable
     NSString *tmpPath = NSTemporaryDirectory();
-    if (tmpPath == nil) {
+    char *tmpdir_cstring = getenv("TMPDIR");
+    if (tmpdir_cstring != NULL && strlen(tmpdir_cstring) > 0) {
+      tmpPath = [NSString stringWithUTF8String:tmpdir_cstring];
+    } else {
+      if (tmpPath == nil) {
         tmpPath = @"/tmp/"; // Fallback, just in case
+      }
     }
-    
+
     // Make sure we can write to temp path
     if ([FILEMGR isWritableFileAtPath:tmpPath] == NO) {
         _error = [NSString stringWithFormat:@"Could not write to the temp directory '%@'.", tmpPath];
@@ -409,7 +415,7 @@ - (BOOL)create {
                                                                  options:0
                                                                    error:nil];
     if (!infoData || ![infoData writeToFile:infoPlistPath atomically:YES]) {
-        _error = @"Error writing Info.plist";
+        _error = [NSString stringWithFormat:@"Error writing Info.plist: '%@'.", infoPlistPath];
         return NO;
     }