From 386d3a950f1e5917326662ddc9836932633457ed Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 5 Jan 2016 17:21:30 -0800
Subject: [PATCH] default to beta/dev build for server console

---
 console/CMakeLists.txt | 14 +++++++++-----
 console/packager.js    |  3 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index df4d9b6610..43933af410 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -1,12 +1,12 @@
 set(TARGET_NAME package-console)
 
-if (BUILD_TAGGED_BETA)
-  set(BETA_OPTION "--beta")
+if (PRODUCTION_BUILD)
+  set(PRODUCTION_OPTION "--production")
 endif()
 
 # add a target that will package the console
 add_custom_target(${TARGET_NAME} ALL
-  COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${BETA_OPTION}
+  COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${PRODUCTION_OPTION}
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
 
@@ -22,7 +22,11 @@ elseif (UNIX)
   set(PACKAGED_CONSOLE_FOLDER "server-console-linux-x64")
 endif ()
 
-# install the packaged Server Console 
-install(PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app" DESTINATION bin COMPONENT ${SERVER_COMPONENT})
+# install the packaged Server Console
+install(
+  PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}/Server Console.app"
+  DESTINATION "Applications/High Fidelity"
+  COMPONENT ${SERVER_COMPONENT}
+)
 
 consolidate_installer_components()
diff --git a/console/packager.js b/console/packager.js
index c71c4fe407..2489436857 100644
--- a/console/packager.js
+++ b/console/packager.js
@@ -11,7 +11,7 @@ if (osType == "Darwin" || osType == "Linux") {
 var argv = require('yargs').argv;
 
 // check which icon we should use, beta or regular
-var iconName = argv.beta ? "console-beta" : "console"
+var iconName = argv.production ? "console" : "console-beta";
 
 // setup the common options for the packager
 var options = {
@@ -32,6 +32,7 @@ const FULL_NAME = "High Fidelity Server Console";
 
 // setup per OS options
 if (osType == "Darwin") {
+    options["app-bundle-id"] = "com.highfidelity.server-console" + (argv.production ? "" : "-dev")
     options["name"] = SHORT_NAME
 } else if (osType == "Windows_NT") {
     options["version-string"] = {