🎉 Add support for creating APFS disk images (#221)

Co-authored-by: Linus Unnebäck <linus@folkdatorn.se>

Author: zorgiepoo

README.md

@@ -68,6 +68,9 @@ the JSON file's path.
     - `UDBZ` - UDIF bzip2-compressed image (OS X 10.4+ only)
     - `ULFO` - UDIF lzfse-compressed image (OS X 10.11+ only)
     - `ULMO` - UDIF lzma-compressed image (macOS 10.15+ only)
+- `filesystem` (enum[string], optional) - Disk image filesystem
+    - `HFS+`
+    - `APFS` (macOS 10.13+ only)
 - `contents` (array[object], required) - This is the contents of your DMG.
     - `x` (number, required) - X position relative to icon center
     - `y` (number, required) - Y position relative to icon center

lib/appdmg.js

@@ -206,7 +206,7 @@ module.exports = exports = function (options) {
    **/
 
   pipeline.addStep('Creating temporary image', function (next) {
-    hdiutil.create(global.opts.title, `${global.megabytes}m`, function (err, temporaryImagePath) {
+    hdiutil.create(global.opts.title, `${global.megabytes}m`, global.opts.filesystem, function (err, temporaryImagePath) {
       if (err) return next(err)
 
       pipeline.addCleanupStep('unlink-temporary-image', 'Removing temporary image', function (next) {
@@ -396,15 +396,20 @@ module.exports = exports = function (options) {
    **/
 
   pipeline.addStep('Blessing image', function (next) {
-    const args = [
-      '--folder', global.temporaryMountPath
-    ]
+    // Blessing does not work for APFS disk images
+    if (global.opts.filesystem != "APFS") {
+      const args = [
+        '--folder', global.temporaryMountPath
+      ]
+
+      if (os.arch() !== 'arm64') {
+        args.push('--openfolder', global.temporaryMountPath)
+      }
 
-    if (os.arch() !== 'arm64') {
-      args.push('--openfolder', global.temporaryMountPath)
+      util.sh('bless', args, next)
+    } else {
+      next.skip()
     }
-
-    util.sh('bless', args, next)
   })
 
   /**

lib/hdiutil.js

@@ -22,14 +22,14 @@ exports.convert = function (source, format, target, cb) {
   })
 }
 
-exports.create = function (volname, size, cb) {
+exports.create = function (volname, size, filesystem, cb) {
   temp.template('%s.dmg').writeFile('', function (err, outname) {
     if (err) return cb(err)
 
     const args = [
       'create', outname,
       '-ov',
-      '-fs', 'HFS+',
+      '-fs', filesystem || 'HFS+',
       '-size', size,
       '-volname', volname
     ]
@@ -53,7 +53,7 @@ exports.attach = function (path, cb) {
   util.sh('hdiutil', args, function (err, res) {
     if (err) return cb(err)
 
-    const m = /Apple_HFS\s+(.*)\s*$/.exec(res.stdout)
+    const m = /\s+(\/Volumes\/.+)$/m.exec(res.stdout)
     if (m === null) return cb(new Error('Failed to mount image'))
 
     cb(null, m[1])

schema.json

@@ -66,6 +66,13 @@
         "UDBZ"
       ]
     },
+    "filesystem": {
+      "type": "string",
+      "enum": [
+        "HFS+",
+        "APFS"
+      ]
+    },
     "contents": {
       "type": "array",
       "items": {