From bdce1c008fd105f82485ae99706069acf8805c8c Mon Sep 17 00:00:00 2001 From: antelle Date: Mon, 11 Jul 2016 22:37:04 +0300 Subject: [PATCH] win fix --- Gruntfile.js | 6 ++++++ .../auto-type/helper/auto-type-helper-win32.js | 2 +- electron/squirrel-handler.js | 3 ++- helper/win32/KeeWebHelper.exe | Bin 0 -> 11264 bytes 4 files changed, 9 insertions(+), 2 deletions(-) create mode 100755 helper/win32/KeeWebHelper.exe diff --git a/Gruntfile.js b/Gruntfile.js index 9a605130..613b6f0f 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -97,6 +97,11 @@ module.exports = function(grunt) { expand: true, nonull: true }, + 'desktop_windows_helper': { + src: 'helper/win32/KeeWebHelper.exe', + dest: 'tmp/desktop/app/', + nonull: true + }, 'desktop_osx': { src: 'tmp/desktop/mac/KeeWeb-' + pkg.version + '.dmg', dest: 'dist/desktop/KeeWeb.mac.dmg', @@ -467,6 +472,7 @@ module.exports = function(grunt) { 'validate-desktop-update', 'electron', 'electron-builder:osx', + 'copy:desktop_windows_helper', 'electron-builder:win', 'compress:linux64', 'compress:linux32', diff --git a/app/scripts/auto-type/helper/auto-type-helper-win32.js b/app/scripts/auto-type/helper/auto-type-helper-win32.js index 506f4f20..ce03a7b3 100644 --- a/app/scripts/auto-type/helper/auto-type-helper-win32.js +++ b/app/scripts/auto-type/helper/auto-type-helper-win32.js @@ -19,7 +19,7 @@ AutoTypeHelper.prototype.getActiveWindowTitle = function(callback) { }; AutoTypeHelper.getHelperPath = function() { - return Launcher.getAppPath('KeeWebHelper.exe'); + return Launcher.getAppPath('helper/win32/KeeWebHelper.exe'); }; module.exports = AutoTypeHelper; diff --git a/electron/squirrel-handler.js b/electron/squirrel-handler.js index d67e1a7e..a56caa4c 100644 --- a/electron/squirrel-handler.js +++ b/electron/squirrel-handler.js @@ -6,7 +6,8 @@ /* jshint node:true */ /* jshint browser:false */ -var app = require('app'), +var electron = require('electron'), + app = electron.app, fs = require('fs'), path = require('path'), spawn = require('child_process').spawn; diff --git a/helper/win32/KeeWebHelper.exe b/helper/win32/KeeWebHelper.exe new file mode 100755 index 0000000000000000000000000000000000000000..4a3380d372edf1c886f47ba12b75cc1b7cf02ac3 GIT binary patch literal 11264 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 literal 0 HcmV?d00001