Merge pull request #13 from kaias1jp/nowplaying-node-linux-disabled

Nowplaying node linux disabled

app/main.js

@@ -12,7 +12,10 @@ const fm = require('font-manager');
 const Menu=electron.Menu
 var updatewin=null;
 const join = require('path').join;
-const {NowPlaying,PlayerName} = require("nowplaying-node");
+// linuxの時は定義しない
+if (process.platform!='linux') {
+  const {NowPlaying,PlayerName} = require("nowplaying-node");
+}
 // アプリケーションをコントロールするモジュール
 const app = electron.app;
 // ウィンドウを作成するモジュール
@@ -688,4 +691,4 @@ object_array_sort(fonts, 'family', 'asc', function(fonts_sorted){
 });
 
 
-app.setAsDefaultProtocolClient('thedesk')
+app.setAsDefaultProtocolClient('thedesk')

app/package.json

@@ -34,14 +34,15 @@
   ],
   "license": "GPL-3.0",
   "dependencies": {
+    "electron": "^3.0.10",
     "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"
   }
 }