Merge pull request electron#138 from electron/use-cross-platform-update-url

Auto update cleanup

Author: kevinsawicki

auto-updater.js

@@ -29,7 +29,7 @@ exports.initialize = function () {
     exports.updateMenu()
   })
 
-  autoUpdater.setFeedURL('https://electron-api-demos.githubapp.com/%3Cspan%20class="x x-first x-last">mac')
+  autoUpdater.setFeedURL('https://electron-api-demos.githubapp.com/%3Cspan%20class="x x-first x-last">updates')
   autoUpdater.checkForUpdates()
 }
 

main-process/menus/application-menu.js

@@ -136,7 +136,7 @@ function addUpdateMenuItems (items, position) {
     }
   }, {
     label: 'Restart and Install Update',
-    enabled: false,
+    enabled: true,
     visible: false,
     key: 'restartToUpdate',
     click: function () {

main.js

@@ -17,15 +17,6 @@ function initialize () {
   var shouldQuit = makeSingleInstance()
   if (shouldQuit) return app.quit()
 
-  // Require and setup each JS file in the main-process dir
-  glob(path.join(__dirname, 'main-process/**/*.js'), function (error, files) {
-    if (error) return console.log(error)
-    files.forEach(function (file) {
-      require(file)
-    })
-    autoUpdater.updateMenu()
-  })
-
   function createWindow () {
     var windowOptions = {
       width: 1080,
@@ -51,6 +42,7 @@ function initialize () {
   }
 
   app.on('ready', function () {
+    loadDemos()
     createWindow()
     autoUpdater.initialize()
   })
@@ -84,6 +76,15 @@ function makeSingleInstance () {
   })
 }
 
+// Require each JS file in the main-process dir
+function loadDemos() {
+  var files = glob.sync(path.join(__dirname, 'main-process/**/*.js'))
+  files.forEach(function (file) {
+    require(file)
+  })
+  autoUpdater.updateMenu()
+}
+
 // Handle Squirrel on Windows startup events
 switch (process.argv[1]) {
   case '--squirrel-install':