added --[no-]clean options and now creates payload folder

Author: scriptingosx

quickpkg

@@ -319,13 +319,12 @@ def cleanup_and_exit(returncode):
     global dmgvolumepaths
     global dmg_was_mounted
     global tmp_path
-
-    if not dmg_was_mounted:
-        detachpaths(dmgvolumepaths)
-    if tmp_path is not None:
-        shutil.rmtree(tmp_path)
-    if tmp_scripts_path is not None:
-        shutil.rmtree(tmp_scripts_path)
+    
+    if args.clean:
+        if not dmg_was_mounted:
+            detachpaths(dmgvolumepaths)
+        if tmp_path is not None:
+            shutil.rmtree(tmp_path)
     exit(returncode)
 
 
@@ -355,6 +354,10 @@ if __name__ == "__main__":
                 If this is a directory, then the
                 package will be created with the default filename {name}-{version}.pkg''')
 
+    parser.add_argument('--clean', dest='clean', action='store_true', help="clean up temp files (default)")
+    parser.add_argument('--no-clean', dest='clean', action='store_false', help=" do NOT clean up temp files")
+    parser.set_defaults(clean=True)
+
     parser.add_argument("-v", "--verbosity", action="count", default=0, help="controls amount of logging output (max -vvv)")
     parser.add_argument('--version', help='prints the version', action='version', version=quickpkg_version)
 
@@ -388,6 +391,9 @@ if __name__ == "__main__":
     tmp_path = None
     dmg_was_mounted = False
     tmp_scripts_path = None
+    tmp_path = tempfile.mkdtemp()
+    payload_path = os.path.join(tmp_path, "payload")
+    os.makedirs(payload_path)
 
     # if item is a dmg, mount it and find useful contents
     if item_extension == 'dmg':
@@ -403,19 +409,17 @@ if __name__ == "__main__":
             print "Found too many Applications! Can't decide!"
             print foundapps
             cleanup_and_exit(1)
-
-        app_path = foundapps[0]
-
+        
     # if item is zip, unzip to tmp location and find useful contents
     if item_extension == 'zip':
-        tmp_path = tempfile.mkdtemp()
-        unzip_cmd = ["/usr/bin/unzip", "-d", tmp_path, item_path]
+        unarchive_path = os.path.join(tmp_path, "unarchive")
+        unzip_cmd = ["/usr/bin/unzip", "-d", unarchive_path, item_path]
         result = cmdexec(unzip_cmd)
         if result["return_code"] != 0:
             print "An error occured while unzipping:"
             print "%d, %s" % (result["return_code"], result["stderr"])
             cleanup_and_exit(1)
-        foundapps = finditemswithextension(tmp_path, 'app')
+        foundapps = finditemswithextension(unarchive_path, 'app')
         if len(foundapps) == 0:
             print "Could not find an application!"
             cleanup_and_exit(1)
@@ -424,15 +428,35 @@ if __name__ == "__main__":
             print foundapps
             cleanup_and_exit(1)
 
-        app_path = foundapps[0]
+    logger("Found application: %s" % foundapps[0], 1)
 
-    logger("Found application: %s" % app_path, 1)
+    # copy found app to payload folder
+    app_name = os.path.basename(foundapps[0])
+    app_path = os.path.join(payload_path, app_name)
+    shutil.copytree(foundapps[0], app_path)        
 
     # extract version and other metadata
     (app_name, app_identifier, app_version) = appNameAndVersion(app_path)
 
     logger("Name: %s, ID: %s, Version: %s" % (app_name, app_identifier, app_version), 1)
 
+    # create the component plist
+    component_plist = os.path.join(tmp_path, app_identifier) + ".plist"
+    analyzecmd = ["/usr/bin/pkgbuild",
+                  "--analyze",
+                  "--root", payload_path,
+                  "--identifier", app_identifier,
+                  "--version", app_version,
+                  "--install-location", "/Applications",
+                  component_plist]
+    result = cmdexec(analyzecmd)
+
+    logger(result["stdout"], 1)
+    if result["return_code"] != 0:
+        print "Error Code: %d " % result["return_code"]
+        print result["stderr"]
+        cleanup_and_exit(1)
+    
     pkg_name = "{name}-{version}.pkg"
     if args.output:
         if os.path.isdir(args.output):
@@ -449,7 +473,8 @@ if __name__ == "__main__":
 
     # run pkgutil to build result
     pkgcmd = ["/usr/bin/pkgbuild",
-              "--component", app_path,
+              "--root", payload_path,
+              "--component-plist", component_plist,
               "--identifier", app_identifier,
               "--version", app_version,
               "--install-location", "/Applications",
@@ -460,7 +485,9 @@ if __name__ == "__main__":
         cleanup_and_exit(1)
 
     if args.postinstall or args.preinstall:
-        tmp_scripts_path = tempfile.mkdtemp()
+        tmp_scripts_path = os.path.join(tmp_dir, "scripts")
+        os.makedirs(tmp_scripts_path)
+        
         if args.scripts:
             logger("copying %s to tmp scripts folder %s" % (args.scripts, tmp_scripts_path), 1)
             shutil.rmtree(tmp_scripts_path)

todo.txt

@@ -1,7 +1,11 @@
+- identify shell scripts and build a payload free package
+    - problems with this:
+    - how to determine if the given file is a script? executable bit? parse the #! ?
+    - how to choose id and version? (for true payload free packages, this may not matter since they don't leave a receipt anyway?)
 - use some preference setting to determine default package name syntax
 - signature support
-- identify shell scripts and build a payload free package
-- support for tar, gzip and bzip
-? other possible file formats: fonts, prefpanes, Safari extensions?
+- support for tar, gzip and bzip and xip
+- identify fonts and put them in /Library/Fonts
+? other possible file formats: prefpanes, Safari extensions?
 ? identify app just by name or id (could use: mdfind "kMDItemKind == 'Application' && kMDItemDisplayName == 'iTunes'")
 ? identify mobileconfigs and build a package installer if make-profile-pkg is present