implemented the --output option

Author: scriptingosx

quickpkg

@@ -191,7 +191,6 @@ if __name__ == "__main__":
                                                  Installer item can be a dmg, zip, or app.""",
                                      epilog="""Example: quickpkg /path/to/installer_item""")
 
-
     # takes a path as input
     parser.add_argument('item_path', help="path to the installer item")
 
@@ -201,8 +200,16 @@ if __name__ == "__main__":
         scripts respectively. If you give both the --scripts and either one or both of --preinstall
         and --postinstall, quickpkg will attempt to merge, but throw an error if it cannot.''')
     scripts_group.add_argument('--scripts', help="path to a folder with scripts")
-    scripts_group.add_argument('--preinstall', help="path to the preinstall script")
-    scripts_group.add_argument('--postinstall', help="path to the postinstall script")
+    scripts_group.add_argument('--preinstall', '--pre', help="path to the preinstall script")
+    scripts_group.add_argument('--postinstall', '--post', help="path to the postinstall script")
+
+    parser.add_argument('--ownership', choices=['recommended', 'preserve', 'preserve-other'],
+                        help="will be passed through to pkgbuild")
+    parser.add_argument('--output', '--out', '-o',
+        help='''path where the package file will be created. If you give the full filename
+              then you can use '{name}', '{version}' and '{identifier}' as placeholders. 
+              If this is a directory, then the
+              package will be created with the default filename {name}-{version}.pkg''')
 
     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)
@@ -282,17 +289,27 @@ if __name__ == "__main__":
 
     logger("Name: %s, ID: %s, Version: %s" % (app_name, app_identifier, app_version), 1)
 
-    # TODO: get name syntax from prefs or parameter
-    pkg_name = "{name}-{version}.pkg".format(name=app_name, version=app_version, identifier=app_identifier)
-    pkg_name = pkg_name.replace(' ', '')  # remove spaces
-    # run pkgutil to build result
+    pkg_name = "{name}-{version}.pkg"
+    if args.output:
+        if os.path.isdir(args.output):
+            pkg_path = os.path.join(args.output, pkg_name)
+        else:
+            pkg_path = args.output
+    else:
+        pkg_path = pkg_name
+    nospace_app_name = app_name.replace(' ', '')  # remove spaces
+    pkg_path= pkg_path.format(name=nospace_app_name, version=app_version, identifier=app_identifier)
+
+    if not pkg_path.endswith('pkg'):
+        pkg_path += '.pkg'
 
+    # run pkgutil to build result
     pkgcmd = ["/usr/bin/pkgbuild",
               "--component", app_path,
               "--identifier", app_identifier,
               "--version", app_version,
               "--install-location", "/Applications",
-              pkg_name]
+              pkg_path]
 
     if args.scripts and not os.path.exists(args.scripts):
         print "scripts folder %s does not exist!" % args.scripts
@@ -312,7 +329,7 @@ if __name__ == "__main__":
             if os.path.exists(postinstall_path):
                 print "postinstall script already exists in %s" % args.scripts
                 cleanup_and_exit(1)
-            logger("copying %s to %s" % (args.postinstall, postinstall_path))
+            logger("copying %s to %s" % (args.postinstall, postinstall_path), 1)
             shutil.copy2(args.postinstall, postinstall_path)
             os.chmod(postinstall_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
                                        stat.S_IRGRP | stat.S_IXGRP |
@@ -325,18 +342,21 @@ if __name__ == "__main__":
             if os.path.exists(preinstall_path):
                 print "preinstall script already exists in %s" % args.scripts
                 cleanup_and_exit(1)
-            logger("copying %s to %s" % (args.preinstall, preinstall_path))
+            logger("copying %s to %s" % (args.preinstall, preinstall_path), 1)
             shutil.copy2(args.preinstall, preinstall_path)
             os.chmod(preinstall_path, stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
                                       stat.S_IRGRP | stat.S_IXGRP |
                                       stat.S_IROTH | stat.S_IXOTH)
 
     if tmp_scripts_path:
-        logger("scripts path: %s" % tmp_scripts_path)
+        logger("scripts path: %s" % tmp_scripts_path, 1)
         pkgcmd.extend(["--scripts", tmp_scripts_path])
     elif args.scripts:
-        logger("scripts path: %s" % args.scripts)
+        logger("scripts path: %s" % args.scripts, 1)
         pkgcmd.extend(["--scripts", args.scripts])
+        
+    if args.ownership:
+        pkgcmd.extend(["--ownership", args.ownership])
 
     result = cmdexec(pkgcmd)
 
@@ -345,6 +365,6 @@ if __name__ == "__main__":
         print "Error Code: %d " % result["return_code"]
         print result["stderr"]
     else:
-        print pkg_name
+        print pkg_path
 
     cleanup_and_exit(0)

todo.txt

@@ -1,9 +1,9 @@
-- use some preference setting to determine package name syntax
+- use some preference setting to determine default package name syntax
 √ add option to add scripts (--scripts, like the scripts folder)
-- add option to add --preinstall script
-- add option for --postinstall script
-- support the --ownership flag
-- option to output pkg to a different dir than cwd
+√ add option to add --preinstall script
+√ add option for --postinstall script
+√ support the --ownership flag
+√ option to output pkg to a different dir than cwd
 - signature support
 - identify shell scripts and build a payload free package
 - identify mobileconfigs and build a package installer if make-profile-pkg is present