From 66b90b39391ba123ba2a9db0bdeda66ef5007c5a Mon Sep 17 00:00:00 2001 From: "ws29.jung" Date: Mon, 18 Feb 2019 21:12:36 +0900 Subject: [PATCH] Separate wrtjs path from chromium-efl As chromium-efl supports downloadable package, wrtjs cannot share chromium-efl's path to install its own files. To prevent wrtjs files removal during chromium-efl update, now this package has its own file install path. Change-Id: Ia536096e314450314e75cb086fd843f1fb5302f4 Signed-off-by: ws29.jung --- packaging/wrtjs.spec | 2 +- wrt_app/browser/init.js | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packaging/wrtjs.spec b/packaging/wrtjs.spec index 8e9886db..4962c493 100755 --- a/packaging/wrtjs.spec +++ b/packaging/wrtjs.spec @@ -26,7 +26,7 @@ Web Runtime Engine based on Electron %endif %install -%define _resourcedir /usr/share/chromium-efl/wrt/app +%define _resourcedir /usr/share/wrt/app install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_datadir}/aul install -d %{buildroot}%{_resourcedir} diff --git a/wrt_app/browser/init.js b/wrt_app/browser/init.js index 0dea6c7d..1c688d7c 100755 --- a/wrt_app/browser/init.js +++ b/wrt_app/browser/init.js @@ -14,4 +14,5 @@ * limitations under the License. */ -require('../../electron.asar/browser/init') +const wrt = require('../browser/wrt'); +require(wrt.getElectronPath() + '/browser/init') -- 2.34.1