From 8968c248dfc72f9daabb882009b2d194e6d0aea3 Mon Sep 17 00:00:00 2001 From: kaias1jp Date: Mon, 28 Jan 2019 18:39:16 +0900 Subject: [PATCH 1/6] modified: main.js modified: package.json --- app/main.js | 6 ++++-- app/package.json | 16 +++++++++------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/app/main.js b/app/main.js index b7b0851e..d55b4998 100644 --- a/app/main.js +++ b/app/main.js @@ -12,7 +12,9 @@ const fm = require('font-manager'); const Menu=electron.Menu var updatewin=null; const join = require('path').join; -const {NowPlaying,PlayerName} = require("nowplaying-node"); +if (process.platform!='linux') { + const {NowPlaying,PlayerName} = require("nowplaying-node"); +} // アプリケーションをコントロールするモジュール const app = electron.app; // ウィンドウを作成するモジュール @@ -688,4 +690,4 @@ object_array_sort(fonts, 'family', 'asc', function(fonts_sorted){ }); -app.setAsDefaultProtocolClient('thedesk') \ No newline at end of file +app.setAsDefaultProtocolClient('thedesk') diff --git a/app/package.json b/app/package.json index 6babaadf..2c3f1787 100644 --- a/app/package.json +++ b/app/package.json @@ -34,14 +34,15 @@ ], "license": "GPL-3.0", "dependencies": { + "electron": "^4.0.2", "electron-dl": "^1.11.0", "font-manager": "^0.3.0", "jimp": "^0.2.28", "node-notifier": "^5.2.1", - "nowplaying-node": "^0.1.3", "sumchecker": "^2.0.2" }, "optionalDependencies": { + "nowplaying-node": "^0.1.3", "itunes-nowplaying-mac": "^0.2.3" }, "build": { @@ -57,10 +58,10 @@ "portable" ] }, - "nsis":{ - "oneClick":false, - "allowToChangeInstallationDirectory":true, - "artifactName":"TheDesk-setup.${ext}" + "nsis": { + "oneClick": false, + "allowToChangeInstallationDirectory": true, + "artifactName": "TheDesk-setup.${ext}" }, "linux": { "icon": "build/icons", @@ -78,7 +79,8 @@ "electronVersion": "3.0.10" }, "devDependencies": { - "electron-rebuild": "^1.8.2", - "electron-prebuilt": "^1.4.13" + "electron-packager": "^13.0.1", + "electron-prebuilt": "^1.4.13", + "electron-rebuild": "^1.8.2" } } From 48da2cf287a2afa1ff5d55f4090f090497fc3201 Mon Sep 17 00:00:00 2001 From: kaias1jp Date: Mon, 28 Jan 2019 18:44:50 +0900 Subject: [PATCH 2/6] new file: TheDeskBuild.sh --- TheDeskBuild.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 TheDeskBuild.sh diff --git a/TheDeskBuild.sh b/TheDeskBuild.sh new file mode 100755 index 00000000..3b62be6e --- /dev/null +++ b/TheDeskBuild.sh @@ -0,0 +1,16 @@ +#!/bin/sh +sudo apt install -y curl +curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - +sudo apt update +sudo apt install -y nodejs build-essential +sudo apt install -y git +sudo apt install -y libfontconfig1-dev +git clone https://github.com/cutls/TheDesk.git +cd TheDesk/app +npm install electron +npm install --save-dev electron-rebuild +./node_modules/.bin/electron-rebuild +npm install electron-packager --save-dev +cd .. +app/node_modules/electron-packager/cli.js ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2019 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.1 --overwrite + From 6411fc9fb195df2f97e11bfb0f80c38623bc6055 Mon Sep 17 00:00:00 2001 From: kaias1jp Date: Mon, 28 Jan 2019 18:56:36 +0900 Subject: [PATCH 3/6] modified: TheDeskBuild.sh --- TheDeskBuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TheDeskBuild.sh b/TheDeskBuild.sh index 3b62be6e..998ccb73 100755 --- a/TheDeskBuild.sh +++ b/TheDeskBuild.sh @@ -5,7 +5,7 @@ sudo apt update sudo apt install -y nodejs build-essential sudo apt install -y git sudo apt install -y libfontconfig1-dev -git clone https://github.com/cutls/TheDesk.git +git clone https://github.com/kaias1jp/TheDesk.git cd TheDesk/app npm install electron npm install --save-dev electron-rebuild From 52cb240be32eeb121ec87c82980c5f7f74c8552f Mon Sep 17 00:00:00 2001 From: "popn.ja" Date: Mon, 28 Jan 2019 20:32:21 +0900 Subject: [PATCH 4/6] modified: TheDeskBuild.sh --- TheDeskBuild.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/TheDeskBuild.sh b/TheDeskBuild.sh index 998ccb73..1f8d43dd 100755 --- a/TheDeskBuild.sh +++ b/TheDeskBuild.sh @@ -7,10 +7,10 @@ sudo apt install -y git sudo apt install -y libfontconfig1-dev git clone https://github.com/kaias1jp/TheDesk.git cd TheDesk/app -npm install electron +npm install electron@3.0.10 npm install --save-dev electron-rebuild ./node_modules/.bin/electron-rebuild npm install electron-packager --save-dev cd .. -app/node_modules/electron-packager/cli.js ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2019 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=4.0.1 --overwrite +app/node_modules/electron-packager/cli.js ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2019 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite From 1efa65652942754cf7e4333e4e5c2b68495ec1fe Mon Sep 17 00:00:00 2001 From: kaias1jp Date: Mon, 28 Jan 2019 21:37:59 +0900 Subject: [PATCH 5/6] modified: main.js modified: package.json --- app/main.js | 1 + app/package.json | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/main.js b/app/main.js index d55b4998..e67f8141 100644 --- a/app/main.js +++ b/app/main.js @@ -12,6 +12,7 @@ const fm = require('font-manager'); const Menu=electron.Menu var updatewin=null; const join = require('path').join; +// linuxの時は定義しない if (process.platform!='linux') { const {NowPlaying,PlayerName} = require("nowplaying-node"); } diff --git a/app/package.json b/app/package.json index 2c3f1787..497d8f4c 100644 --- a/app/package.json +++ b/app/package.json @@ -34,7 +34,7 @@ ], "license": "GPL-3.0", "dependencies": { - "electron": "^4.0.2", + "electron": "^3.0.10", "electron-dl": "^1.11.0", "font-manager": "^0.3.0", "jimp": "^0.2.28", From 1f1a429e35f41effb74542534d6d39ded3d1079b Mon Sep 17 00:00:00 2001 From: kaias1jp Date: Mon, 28 Jan 2019 21:45:49 +0900 Subject: [PATCH 6/6] Delete TheDeskBuild.sh --- TheDeskBuild.sh | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100755 TheDeskBuild.sh diff --git a/TheDeskBuild.sh b/TheDeskBuild.sh deleted file mode 100755 index 1f8d43dd..00000000 --- a/TheDeskBuild.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -sudo apt install -y curl -curl -sL https://deb.nodesource.com/setup_10.x | sudo -E bash - -sudo apt update -sudo apt install -y nodejs build-essential -sudo apt install -y git -sudo apt install -y libfontconfig1-dev -git clone https://github.com/kaias1jp/TheDesk.git -cd TheDesk/app -npm install electron@3.0.10 -npm install --save-dev electron-rebuild -./node_modules/.bin/electron-rebuild -npm install electron-packager --save-dev -cd .. -app/node_modules/electron-packager/cli.js ./app TheDesk --executable-name="TheDesk" --app-copyright="Copyright (c) TheDesk 2019 Cutls.com 2015 All Right Reserved" --platform=linux --arch=x64,ia32 --electron-version=3.0.10 --overwrite -