From b1d0e42de8079146d08d5e97264b9c0c4516de69 Mon Sep 17 00:00:00 2001
From: milad <milad@miladnazeri.com>
Date: Thu, 31 Oct 2019 10:00:22 -0700
Subject: [PATCH] updated packager

---
 screenshare/packager.js     | 40 +++++++++++++++++++++++++++----------
 screenshare/packager_mac.js | 26 ------------------------
 2 files changed, 29 insertions(+), 37 deletions(-)
 delete mode 100644 screenshare/packager_mac.js

diff --git a/screenshare/packager.js b/screenshare/packager.js
index fe701e5d87..5a8e4fb082 100644
--- a/screenshare/packager.js
+++ b/screenshare/packager.js
@@ -1,25 +1,43 @@
 var packager = require('electron-packager');
+var osType = require('os').type();
+
+var platform = null;
+if (osType == "Darwin" || osType == "Linux") {
+    platform = osType.toLowerCase();
+} else if (osType == "Windows_NT") {
+    platform = "win32"
+}
+
+var NAME = "hifi-screenshare";
 var options = {
     dir: __dirname,
-    name: "hifi-screenshare",
+    name: NAME,
     version: "0.1.0",
     overwrite: true,
     prune: true,
     arch: "x64",
-    platform: "win32",
-    CompanyName: "High Fidelity, Inc.",
-    FileDescription: "High Fidelity Screenshare",
-    OriginalFilename: "hifi-screenshare.exe",
+    platform: platform,
     ignore: "electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
 };
 
+// setup per OS options
+if (osType == "Darwin") {
+    options["app-bundle-id"] = "com.highfidelity.hifi-screenshare";
+} else if (osType == "Windows_NT") {
+    options["version-string"] = {
+        CompanyName: "High Fidelity, Inc.",
+        FileDescription: "High Fidelity Screenshare",
+        ProductName: NAME,
+        OriginalFilename: NAME + ".exe"
+    }
+}
 
 // call the packager to produce the executable
-packager(options, function(error, appPath) {
-    if (error) {
+packager(options)
+    .then(appPath => {
+        console.log("Wrote new app to " + appPath);
+    })
+    .catch(error => {
         console.error("There was an error writing the packaged console: " + error.message);
         process.exit(1);
-    } else {
-        console.log("Wrote new app to " + appPath);
-    }
-});
+    });
\ No newline at end of file
diff --git a/screenshare/packager_mac.js b/screenshare/packager_mac.js
deleted file mode 100644
index 40cac7b743..0000000000
--- a/screenshare/packager_mac.js
+++ /dev/null
@@ -1,26 +0,0 @@
-var packager = require('electron-packager');
-var options = {
-    dir: __dirname,
-    name: "hifi-screenshare",
-    version: "0.1.0",
-    overwrite: true,
-    prune: true,
-    arch: "x64",
-    platform: "darwin",
-    CompanyName: "High Fidelity, Inc.",
-    FileDescription: "High Fidelity Screenshare",
-    OriginalFilename: "hifi-screenshare.app",
-    ignore: "electron-packager|README.md|CMakeLists.txt|packager.js|.gitignore"
-};
-
-options["app-bundle-id"] = "com.highfidelity.screenshare"; 
-
-// call the packager to produce the executable
-packager(options, function(error, appPath) {
-    if (error) {
-        console.error("There was an error writing the packaged console: " + error.message);
-        process.exit(1);
-    } else {
-        console.log("Wrote new app to " + appPath);
-    }
-});