From 83dd1dcb34b756db990d9fad587b56399533e72f Mon Sep 17 00:00:00 2001
From: Mark Lee <electronjs@lazymalevolence.com>
Date: Tue, 9 Jun 2015 19:17:21 -0700
Subject: [PATCH] Move asar code to a common location

---
 common.js | 17 +++++++++++++++++
 linux.js  | 17 ++---------------
 mac.js    | 15 +++------------
 win32.js  | 16 +++-------------
 4 files changed, 25 insertions(+), 40 deletions(-)
 create mode 100644 common.js

diff --git a/common.js b/common.js
new file mode 100644
index 0000000..2c9d522
--- /dev/null
+++ b/common.js
@@ -0,0 +1,17 @@
+var asar = require('asar')
+var path = require('path')
+var rimraf = require('rimraf')
+
+module.exports = {
+  asarApp: function asarApp (finalDir, cb) {
+    var src = path.join(finalDir, 'resources', 'app')
+    var dest = path.join(finalDir, 'resources', 'app.asar')
+    asar.createPackage(src, dest, function (err) {
+      if (err) return cb(err)
+      rimraf(src, function (err) {
+        if (err) return cb(err)
+        cb(null, dest)
+      })
+    })
+  }
+}
diff --git a/linux.js b/linux.js
index 4fe048d..a00bbeb 100644
--- a/linux.js
+++ b/linux.js
@@ -3,8 +3,7 @@ var fs = require('fs')
 var child = require('child_process')
 var mkdirp = require('mkdirp')
 var ncp = require('ncp').ncp
-var rimraf = require('rimraf')
-var asar = require('asar')
+var common = require('./common')
 
 module.exports = {
   createApp: function createApp (opts, templateApp, cb) {
@@ -45,7 +44,7 @@ module.exports = {
       fs.rename(originalBinary, finalBinary, function electronRenamed (err) {
         if (err) return cb(err)
         if (opts.asar) {
-          asarApp(cb)
+          common.asarApp(finalDir, cb)
         } else {
           cb(null, finalBinary)
         }
@@ -72,18 +71,6 @@ module.exports = {
       return true
     }
 
-    function asarApp (cb) {
-      var src = path.join(finalDir, 'resources', 'app')
-      var dest = path.join(finalDir, 'resources', 'app.asar')
-      asar.createPackage(src, dest, function (err) {
-        if (err) return cb(err)
-        rimraf(src, function (err) {
-          if (err) return cb(err)
-          cb(null, dest)
-        })
-      })
-    }
-
     copyApp()
   }
 }
diff --git a/mac.js b/mac.js
index 26ab295..6027d11 100644
--- a/mac.js
+++ b/mac.js
@@ -7,7 +7,7 @@ var plist = require('plist')
 var mkdirp = require('mkdirp')
 var rimraf = require('rimraf')
 var ncp = require('ncp').ncp
-var asar = require('asar')
+var common = require('./common')
 
 module.exports = {
   createApp: function createApp (opts, electronPath, cb) {
@@ -106,7 +106,8 @@ function buildMacApp (opts, cb, newApp) {
         fs.rename(newApp, finalPath, function moved (err) {
           if (err) return cb(err)
           if (opts.asar) {
-            asarApp(function (err) {
+            var finalPath = path.join(opts.out || process.cwd(), opts.name + '.app', 'Contents', 'Resources')
+            common.asarApp(finalPath, function (err) {
               if (err) return cb(err)
               updateMacIcon(function (err) {
                 if (err) return cb(err)
@@ -135,16 +136,6 @@ function buildMacApp (opts, cb, newApp) {
       })
     }
 
-    function asarApp (cb) {
-      var finalPath = path.join(opts.out || process.cwd(), opts.name + '.app', 'Contents', 'Resources')
-      var src = path.join(finalPath, 'app')
-      var dest = path.join(finalPath, 'app.asar')
-      asar.createPackage(src, dest, function (err) {
-        if (err) return cb(err)
-        rimraf(src, cb)
-      })
-    }
-
     function codesign () {
       var appPath = path.join(opts.out || process.cwd(), opts.name + '.app')
 
diff --git a/win32.js b/win32.js
index be3a5eb..ca5b31a 100644
--- a/win32.js
+++ b/win32.js
@@ -5,9 +5,9 @@ var child = require('child_process')
 var mkdirp = require('mkdirp')
 var rimraf = require('rimraf')
 var ncp = require('ncp').ncp
-var asar = require('asar')
 var mv = require('mv')
 var rcedit = require('rcedit')
+var common = require('./common')
 
 module.exports = {
   createApp: function createApp (opts, electronApp, cb) {
@@ -87,7 +87,8 @@ function buildWinApp (opts, cb, newApp) {
       copy(newApp, finalPath, function moved (err) {
         if (err) return cb(err)
         if (opts.asar) {
-          asarApp(function (err) {
+          var finalPath = path.join(opts.out || process.cwd(), opts.name + '-win32', 'resources')
+          common.asarApp(finalPath, function (err) {
             if (err) return cb(err)
             updateIcon()
           })
@@ -109,17 +110,6 @@ function buildWinApp (opts, cb, newApp) {
       rcedit(exePath, {icon: opts.icon}, function (err) {
         cb(err, finalPath)
       })
-
-    }
-
-    function asarApp (cb) {
-      var finalPath = path.join(opts.out || process.cwd(), opts.name + '-win32', 'resources')
-      var src = path.join(finalPath, 'app')
-      var dest = path.join(finalPath, 'app.asar')
-      asar.createPackage(src, dest, function (err) {
-        if (err) return cb(err)
-        rimraf(src, cb)
-      })
     }
   })
 }