Merge pull request #7 from lolamtisch/pkg

Pkg
lolamtisch · Aug 9, 2019 · dc3d2e3 · dc3d2e3
2 parents fe4d064 + 4b49744
commit dc3d2e3
Show file tree

Hide file tree

Showing 9 changed files with 376 additions and 34 deletions.
diff --git a/Extension/background.js b/Extension/background.js
@@ -20,6 +20,9 @@ async function websocketReady(){
       websocketOk = true;
       setPresenceIcon();
     };
+    websocket.onmessage = function (evt) {
+      console.log("Connected", JSON.parse(evt.data));
+    };
   })
 }
 

diff --git a/Extension/popup/popup.html b/Extension/popup/popup.html
@@ -7,14 +7,21 @@
       }
       body{
         width: 250px;
+        margin: 0;
+        padding: 0;
         color: white;
         font-size: 14px;
       }
+      #main{
+        margin: 10px;
+      }
     </style>
 
   </head>
-  <body id="main">
-    <div><b>Loading</b></div>
+  <body>
+    <div id="main">
+      <div><b>Loading</b></div>
+    </div>
     <script type="text/javascript" src="popup.js"></script>
   </body>
 </html>
diff --git a/Server/pkg/pack.js b/Server/pkg/pack.js
@@ -0,0 +1,23 @@
+const archiver = require('archiver');
+const fs = require('fs');
+const path = require('path');
+
+const dist = path.join(__dirname, '../../dist');
+
+var archive = archiver('zip', {
+  zlib: { level: 9 }
+});
+
+archive.pipe(fs.createWriteStream(path.join(dist, '/windows_64bit.zip')));
+archive.file(path.join(dist, 'server_win_64bit.exe'), { name: 'server_win.exe' });
+archive.file(path.join(__dirname, 'startup_windows.bat'), { name: 'startup_windows.bat' });
+archive.finalize();
+
+archive = archiver('zip', {
+  zlib: { level: 9 }
+});
+
+archive.pipe(fs.createWriteStream(path.join(dist, '/windows_32bit.zip')));
+archive.file(path.join(dist, 'server_win_32bit.exe'), { name: 'server_win.exe' });
+archive.file(path.join(__dirname, 'startup_windows.bat'), { name: 'startup_windows.bat' });
+archive.finalize();
diff --git a/Server/pkg/startup_windows.bat b/Server/pkg/startup_windows.bat
@@ -0,0 +1,39 @@
+:begin
+cls
+@echo off
+if not "%1"=="am_admin" (powershell start -verb runas '%0' am_admin & exit /b)
+
+Set keyname=MAL Sync Program
+
+echo	MAL-Sync
+echo    1. Add MAL-Sync Program to Startup
+echo    2. Remove MAL-Sync Program From Startup
+echo    x. Exit
+
+set /p choice=  Choose A Service:
+if not '%choice%'== set %choice%=choice:~0,1%
+
+if '%choice%'=='1' goto :addstartup
+if '%choice%'=='2' goto :delstartup
+if '%choice%'=='x' goto :exit
+
+:addstartup
+cls
+
+if exist %~dp0server_win.exe (
+    reg add HKLM\Software\Microsoft\Windows\CurrentVersion\Run\ /v "%keyname%" /t REG_SZ /d %~dp0server_win.exe
+) else (
+    echo File not found!
+)
+
+timeout /t 2 >nul
+
+goto begin
+
+:delstartup
+cls
+reg delete HKLM\Software\Microsoft\Windows\CurrentVersion\Run\ /v "%keyname%" /f
+
+timeout /t 2 >nul
+
+goto begin
diff --git a/Server/pkg/win.json b/Server/pkg/win.json
@@ -0,0 +1,8 @@
+{
+  "name": "server_win_64bit_debug",
+  "pkg": {
+    "assets": [
+      "./../../node_modules/systray/traybin/**/*release.exe"
+    ]
+  }
+}
diff --git a/Server/win_tray_server.js b/Server/win_tray_server.js