From 3b4a3659f92ac56b7fe5dc093150804182402a63 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 13 Jun 2016 11:24:15 -0700 Subject: [PATCH 1/2] Unpack protocol-link.html --- package.json | 6 +++--- renderer-process/system/protocol-handler.js | 3 ++- script/mas.sh | 1 + 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 7e11f080..d921e975 100644 --- a/package.json +++ b/package.json @@ -12,9 +12,9 @@ "test": "mocha tests && npm run lint", "sign-exe": "signcode ./out/ElectronAPIDemos-win32-ia32/ElectronAPIDemos.exe --cert ~/electron-api-demos.p12 --prompt --name 'Electron API Demos' --url 'http://electron.atom.io'", "sign-installer": "signcode ./out/windows-installer/ElectronAPIDemosSetup.exe --cert ~/electron-api-demos.p12 --prompt --name 'Electron API Demos' --url 'http://electron.atom.io'", - "pack-mac": "electron-packager . --asar --overwrite --platform=darwin --arch=x64 --icon=assets/app-icon/mac/app.icns --prune=true --out=out --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist", - "pack-win": "electron-packager . ElectronAPIDemos --asar --overwrite --platform=win32 --arch=ia32 --icon=assets/app-icon/win/app.ico --prune=true --out=out --version-string.CompanyName='GitHub, Inc.' --version-string.FileDescription='Electron API Demos' --version-string.ProductName='Electron API Demos'", - "pack-linux": "electron-packager . --asar --overwrite --platform=linux --arch=x64 --icon=assets/app-icon/png/64.png --prune=true --out=out", + "pack-mac": "electron-packager . --asar --asar-unpack=protocol-link.html --overwrite --platform=darwin --arch=x64 --icon=assets/app-icon/mac/app.icns --prune=true --out=out --osx-sign.identity='Developer ID Application: GitHub' --extend-info=assets/mac/info.plist", + "pack-win": "electron-packager . ElectronAPIDemos --asar --asar-unpack=protocol-link.html --overwrite --platform=win32 --arch=ia32 --icon=assets/app-icon/win/app.ico --prune=true --out=out --version-string.CompanyName='GitHub, Inc.' --version-string.FileDescription='Electron API Demos' --version-string.ProductName='Electron API Demos'", + "pack-linux": "electron-packager . --asar --asar-unpack=protocol-link.html --overwrite --platform=linux --arch=x64 --icon=assets/app-icon/png/64.png --prune=true --out=out", "package": "npm run pack-mac && npm run pack-win && npm run pack-linux", "installer": "node ./script/installer.js", "windows-store": "node ./script/windows-store.js", diff --git a/renderer-process/system/protocol-handler.js b/renderer-process/system/protocol-handler.js index 40e03849..d46c8016 100644 --- a/renderer-process/system/protocol-handler.js +++ b/renderer-process/system/protocol-handler.js @@ -5,6 +5,7 @@ const path = require('path') const protocolHandlerBtn = document.getElementById('protocol-handler') protocolHandlerBtn.addEventListener('click', function () { - const pagePath = path.join('file://', __dirname, '../../sections/system/protocol-link.html') + const appDirectory = __dirname.replace('app.asar', 'app.asar.unpacked') + const pagePath = path.join('file://', appDirectory, '../../sections/system/protocol-link.html') shell.openExternal(pagePath) }) diff --git a/script/mas.sh b/script/mas.sh index ad239537..2795dd7c 100755 --- a/script/mas.sh +++ b/script/mas.sh @@ -8,6 +8,7 @@ APP="Electron APIs" electron-packager . \ "$APP" \ --asar \ + --asar-unpack=protocol-link.html \ --overwrite \ --platform=mas \ --app-bundle-id=com.github.electron-api-demos \ From d24001ca814c9ea2bde9f9aaedafdbfd3c2368e8 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Mon, 13 Jun 2016 11:29:01 -0700 Subject: [PATCH 2/2] appDirectory -> pageDirectory --- renderer-process/system/protocol-handler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renderer-process/system/protocol-handler.js b/renderer-process/system/protocol-handler.js index d46c8016..b59f9fe0 100644 --- a/renderer-process/system/protocol-handler.js +++ b/renderer-process/system/protocol-handler.js @@ -5,7 +5,7 @@ const path = require('path') const protocolHandlerBtn = document.getElementById('protocol-handler') protocolHandlerBtn.addEventListener('click', function () { - const appDirectory = __dirname.replace('app.asar', 'app.asar.unpacked') - const pagePath = path.join('file://', appDirectory, '../../sections/system/protocol-link.html') + const pageDirectory = __dirname.replace('app.asar', 'app.asar.unpacked') + const pagePath = path.join('file://', pageDirectory, '../../sections/system/protocol-link.html') shell.openExternal(pagePath) })