diff --git a/lib/utils.js b/lib/utils.js index 0e35a38..25d476e 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -508,3 +508,20 @@ function sanitizeNotifuTypeArgument(type) { return 'info'; } + +module.exports.getVendorDir = function() { + var dirName = __dirname; + // Check to see if it is on electron application + // Should copy vendor folder to app.asar.unpacked. + if ( + dirName.endsWith( + 'Contents/Resources/app.asar/node_modules/node-notifier/lib' || + dirName.endsWith( + 'resources\\app.asar\\node_modules\\node-notifier\\lib' + ) + ) + ) { + dirName = dirName.replace('app.asar', 'app.asar.unpacked'); + } + return path.resolve(dirName, '../vendor'); +}; diff --git a/notifiers/balloon.js b/notifiers/balloon.js index 2368b72..84eac11 100644 --- a/notifiers/balloon.js +++ b/notifiers/balloon.js @@ -22,9 +22,10 @@ Usage */ var path = require('path'); -var notifier = path.resolve(__dirname, '../vendor/notifu/notifu'); -var checkGrowl = require('../lib/checkGrowl'); var utils = require('../lib/utils'); +var notifier = path.resolve(utils.getVendorDir(), 'notifu/notifu'); +var checkGrowl = require('../lib/checkGrowl'); + var Toaster = require('./toaster'); var Growl = require('./growl'); var os = require('os'); diff --git a/notifiers/notificationcenter.js b/notifiers/notificationcenter.js index 0084eb1..03cf671 100644 --- a/notifiers/notificationcenter.js +++ b/notifiers/notificationcenter.js @@ -5,8 +5,8 @@ var utils = require('../lib/utils'); var Growl = require('./growl'); var path = require('path'); var notifier = path.join( - __dirname, - '../vendor/terminal-notifier.app/Contents/MacOS/terminal-notifier' + utils.getVendorDir(), + 'terminal-notifier.app/Contents/MacOS/terminal-notifier' ); var EventEmitter = require('events').EventEmitter; diff --git a/notifiers/toaster.js b/notifiers/toaster.js index 4a852bb..154fe8b 100644 --- a/notifiers/toaster.js +++ b/notifiers/toaster.js @@ -2,8 +2,9 @@ * Wrapper for the toaster (https://github.com/nels-o/toaster) */ var path = require('path'); -var notifier = path.resolve(__dirname, '../vendor/snoreToast/SnoreToast.exe'); var utils = require('../lib/utils'); +var notifier = path.resolve(utils.getVendorDir(), 'snoreToast/SnoreToast.exe'); + var Balloon = require('./balloon'); var EventEmitter = require('events').EventEmitter; diff --git a/vendor/terminal-notifier.app/Contents/Info.plist b/vendor/terminal-notifier.app/Contents/Info.plist index f08df7b..7d76051 100644 --- a/vendor/terminal-notifier.app/Contents/Info.plist +++ b/vendor/terminal-notifier.app/Contents/Info.plist @@ -3,23 +3,23 @@ BuildMachineOSBuild - 16E195 + 17D102 CFBundleDevelopmentRegion en CFBundleExecutable terminal-notifier CFBundleIconFile - Terminal + Geniocare CFBundleIdentifier - nl.superalloy.oss.terminal-notifier + nl.superalloy.oss. CFBundleInfoDictionaryVersion - 6.0 + 6.1 CFBundleName terminal-notifier CFBundlePackageType APPL CFBundleShortVersionString - 1.7.2 + 1.6.2 CFBundleSignature ???? CFBundleSupportedPlatforms @@ -27,37 +27,30 @@ MacOSX CFBundleVersion - 17 + 13 DTCompiler com.apple.compilers.llvm.clang.1_0 DTPlatformBuild - 8B62 + 9C40b DTPlatformVersion GM DTSDKBuild - 16B2649 + 17C76 DTSDKName - macosx10.12 + macosx10.13 DTXcode - 0810 + 0920 DTXcodeBuild - 8B62 + 9C40b LSMinimumSystemVersion 10.8 LSUIElement - NSAppTransportSecurity - - NSAllowsArbitraryLoads - - NSHumanReadableCopyright - Copyright © 2012-2016 Eloy Durán, Julien Blanchard. All rights reserved. + Copyright © 2012 Eloy Durán. All rights reserved. NSMainNibFile MainMenu NSPrincipalClass NSApplication - NSUserNotificationAlertStyle - alert diff --git a/vendor/terminal-notifier.app/Contents/MacOS/terminal-notifier b/vendor/terminal-notifier.app/Contents/MacOS/terminal-notifier index dc1127a..ead4053 100755 Binary files a/vendor/terminal-notifier.app/Contents/MacOS/terminal-notifier and b/vendor/terminal-notifier.app/Contents/MacOS/terminal-notifier differ diff --git a/vendor/terminal-notifier.app/Contents/Resources/Terminal.icns b/vendor/terminal-notifier.app/Contents/Resources/Terminal.icns deleted file mode 100644 index 8d8f5c2..0000000 Binary files a/vendor/terminal-notifier.app/Contents/Resources/Terminal.icns and /dev/null differ