fix absolute path bug in darwin install - fix #45

electron-userland · Oct 15, 2015 · 05466cb · 05466cb
1 parent a0ad55c
commit 05466cb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/index.js b/index.js
@@ -23,11 +23,14 @@ var Builder = {
    * @param  {Function} callback callback
    */
   build : function( options, callback ) {
+
     options     = options || {};
     options.log = options.log || console.log;
     options.out = options.out ? path.resolve( process.cwd(), options.out ) : process.cwd();
 
-
+    options.log(
+      '- Running electron-builder ' + require( './package' ).version
+    );
 
     // make sure the output
     // directory ends with a slash

diff --git a/lib/osx.js b/lib/osx.js
@@ -28,12 +28,12 @@ var OSXBuilder = {
       return callback( new Error( 'Invalid platform.' ) );
     }
 
-    options.log( '- Starting build for ´' + options.platform + '´ - ' );
+    options.log( '- Starting creation of installer for ´' + options.platform );
 
     options.log( 'Writing temporary ´appdmg.json´' );
 
-    options.config.osx.background         = path.join( options.basePath, options.config.osx.background );
-    options.config.osx.icon               = path.join( options.basePath, options.config.osx.icon );
+    options.config.osx.background         = path.resolve( options.basePath, options.config.osx.background );
+    options.config.osx.icon               = path.resolve( options.basePath, options.config.osx.icon );
     options.config.osx.contents[ 1 ].path = options.appPath;
 
     var configFilePath = path.join( os.tmpDir(), 'appdmg.json' );

diff --git a/lib/win.js b/lib/win.js
@@ -25,7 +25,7 @@ var WinBuilder = {
    * @param  {Function} callback callback
    */
   build : function( options, callback ) {
-    options.log( '- Starting build for ´' + options.platform + '´ - ' );
+    options.log( '- Starting creation of installer for ´' + options.platform );
 
     var configFilePath = writeConfigFile( 'installer.nsi', {
       appPath : _windowsify( options.appPath ),