Merge pull request #106 from LinusU/optional-icon-size

Make icon-size optional
LinusU · May 22, 2016 · 19abd27 · 19abd27
2 parents df77c2c + 17bb31f
commit 19abd27
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -39,7 +39,6 @@ the JSON file's path.
   "title": "Test Application",
   "icon": "test-app.icns",
   "background": "test-background.png",
-  "icon-size": 80,
   "contents": [
     { "x": 448, "y": 344, "type": "link", "path": "/Applications" },
     { "x": 192, "y": 344, "type": "file", "path": "TestApp.app" }
@@ -53,7 +52,7 @@ the JSON file's path.
 + `icon` (string, optional) - Path to your icon, which will be shown when mounted
 + `background` (string, optional) - Path to your background
 + `background-color` (string, optional) - Background color (accepts css colors)
-+ `icon-size` (string, required) - Size of all the icons inside the DMG
++ `icon-size` (string, optional) - Size of all the icons inside the DMG
 + `window` (object, optional) - Window options
     + `position` (object, optional) - Position when opened
         + `x` (number, required) - X position relative to bottom of the screen

diff --git a/lib/appdmg.js b/lib/appdmg.js
@@ -354,7 +354,7 @@ module.exports = exports = function (options) {
     var ds = new DSStore()
 
     ds.vSrn(1)
-    ds.setIconSize(global.opts['icon-size'])
+    ds.setIconSize(global.opts['icon-size'] || 80)
 
     if (global.opts['background-color']) {
       var rgb = parseColor(global.opts['background-color']).rgb

diff --git a/schema.json b/schema.json
@@ -99,7 +99,6 @@
   },
   "required": [
     "title",
-    "icon-size",
     "contents"
   ]
 }
diff --git a/test/api.js b/test/api.js
@@ -89,7 +89,6 @@ describe('api', function () {
         title: 'Test Title',
         icon: 'TestIcon.icns',
         background: 'TestBkg.png',
-        'icon-size': 80,
         contents: [
           { x: 448, y: 344, type: 'link', path: '/Applications' },
           { x: 192, y: 344, type: 'file', path: 'TestApp.app' },
@@ -118,7 +117,6 @@ describe('api', function () {
         icon: 'TestIcon.icns',
         background: 'TestBkg.png',
         format: 'UDRO',
-        'icon-size': 80,
         contents: [
           { x: 448, y: 344, type: 'link', path: '/Applications' },
           { x: 192, y: 344, type: 'file', path: 'TestApp.app' },

diff --git a/test/assets/appdmg-bg-color.json b/test/assets/appdmg-bg-color.json
@@ -2,7 +2,6 @@
   "title": "Test Title",
   "icon": "TestIcon.icns",
   "background-color": "mintcream",
-  "icon-size": 80,
   "contents": [
     { "x": 448, "y": 344, "type": "link", "path": "/Applications" },
     { "x": 192, "y": 344, "type": "file", "path": "TestApp.app" },

diff --git a/test/assets/appdmg.json b/test/assets/appdmg.json
@@ -2,7 +2,6 @@
   "title": "Test Title",
   "icon": "TestIcon.icns",
   "background": "TestBkg.png",
-  "icon-size": 80,
   "contents": [
     { "x": 448, "y": 344, "type": "link", "path": "/Applications" },
     { "x": 192, "y": 344, "type": "file", "path": "TestApp.app" },