From 98873e4c5db8c73aa5dd11a58bcb5804ebfcb81a Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Thu, 18 Jun 2015 11:38:34 -0700
Subject: [PATCH] Fix small windows installer bugs

---
 Gruntfile.js | 21 ++++++++++-----------
 package.json |  2 +-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 14049c8eb8..30bc6d3a25 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -64,7 +64,7 @@ module.exports = function (grunt) {
     electron: {
       windows: {
         options: {
-          name: APPNAME,
+          name: BASENAME,
           dir: 'build/',
           out: 'dist/',
           version: packagejson['electron-version'],
@@ -92,20 +92,20 @@ module.exports = function (grunt) {
       exes: {
         files: [{
           expand: true,
-          cwd: 'dist/' + APPNAME + '-win32',
-          src: [APPNAME + '.exe']
+          cwd: 'dist/' + BASENAME + '-win32',
+          src: [BASENAME + '.exe']
         }],
         options: {
           icon: 'util/kitematic.ico',
           'file-version': packagejson.version,
           'product-version': packagejson.version,
           'version-string': {
-            'CompanyName': 'Docker, Inc',
+            'CompanyName': 'Docker Inc',
             'ProductVersion': packagejson.version,
             'ProductName': APPNAME,
             'FileDescription': APPNAME,
-            'InternalName': APPNAME + '.exe',
-            'OriginalFilename': APPNAME + '.exe',
+            'InternalName': BASENAME + '.exe',
+            'OriginalFilename': BASENAME + '.exe',
             'LegalCopyright': 'Copyright 2015 Docker Inc. All rights reserved.'
           }
         }
@@ -113,16 +113,15 @@ module.exports = function (grunt) {
     },
 
     'create-windows-installer': {
-      appDirectory: 'dist/' + APPNAME + '-win32/',
+      appDirectory: 'dist/' + BASENAME + '-win32/',
       authors: 'Docker Inc.',
       loadingGif: 'util/loading.gif',
       setupIcon: 'util/kitematic.ico',
       description: APPNAME,
       title: APPNAME,
-      exe: APPNAME + '.exe',
+      exe: BASENAME + '.exe',
       version: packagejson.version,
-      certificateFile: certificateFile,
-      certificatePassword: certificatePassword
+      signWithParams: '/f ' + certificateFile + ' /p ' + certificatePassword + ' /tr http://timestamp.comodoca.com/rfc3161'
     },
 
     // docker binaries
@@ -169,7 +168,7 @@ module.exports = function (grunt) {
           expand: true,
           cwd: 'resources',
           src: ['docker*', 'boot2docker.iso', 'ssh.exe', 'OPENSSH_LICENSE', 'msys-*'],
-          dest: 'dist/' + APPNAME + '-win32/resources/resources/'
+          dest: 'dist/' + BASENAME + '-win32/resources/resources/'
         }],
         options: {
           mode: true
diff --git a/package.json b/package.json
index f6d57e2b5a..bb2ed705e9 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
   "docker-version": "1.6.2",
   "docker-machine-version": "0.3.0-rc3",
   "docker-compose-version": "1.2.0",
-  "electron-version": "0.28.2",
+  "electron-version": "0.27.2",
   "virtualbox-version": "4.3.28",
   "virtualbox-filename": "VirtualBox-4.3.28.pkg",
   "virtualbox-filename-win": "VirtualBox-4.3.28.exe",