From 9fcb3163fa36c6009f52c0e8952e0f3b75aa2d65 Mon Sep 17 00:00:00 2001 From: Jeffrey Morgan Date: Fri, 19 Jun 2015 09:53:25 -0700 Subject: [PATCH] Fixed bug where boot2docker iso would not be downloaded only once in dev mode --- Gruntfile.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index a77a2c83dc..ceecb1e137 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -29,11 +29,10 @@ module.exports = function (grunt) { }; grunt.registerTask('download-boot2docker-iso', 'Downloads provided boot2docker version', function () { - var version = grunt.config('version'); try { - var data = fs.readFileSync(path.join('resources', 'boot2docker.iso')); + var data = fs.readFileSync(path.join('resources', 'boot2docker.iso'), {encoding: 'utf-8'}); var match = data.match(/Boot2Docker-v(\d+\.\d+\.\d+)/); - if (match && match[1] !== version) { + if (match && match[1] !== packagejson['docker-version']) { grunt.task.run('curl:boot2docker-iso'); } } catch (err) { @@ -52,6 +51,7 @@ module.exports = function (grunt) { grunt.task.run('chmod'); } done(); + }); }); @@ -131,7 +131,7 @@ module.exports = function (grunt) { authors: 'Docker Inc.', loadingGif: 'util/loading.gif', setupIcon: 'util/setup.ico', - iconUrl: 'util/kitematic.ico', + iconUrl: 'https://raw.githubusercontent.com/kitematic/kitematic/master/util/kitematic.ico', description: APPNAME, title: APPNAME, exe: BASENAME + '.exe',