From 33a122c08eac017d3d3857a556cb62cede97627c Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Wed, 30 May 2018 12:05:07 -0700
Subject: [PATCH] remove short SHA where it should not appear

---
 cmake/macros/SetPackagingParameters.cmake  | 5 +++--
 cmake/templates/console-build-info.json.in | 3 ++-
 server-console/src/main.js                 | 5 +----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index c589d8efff..bde6d55e84 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -113,6 +113,7 @@ macro(SET_PACKAGING_PARAMETERS)
       message(FATAL_ERROR "Could not retreive abbreviated SHA for PR or production master build")
     endif ()
 
+    set(BUILD_VERSION_NO_SHA ${BUILD_VERSION})
     set(BUILD_VERSION "${BUILD_VERSION}-${GIT_COMMIT_HASH}")
 
     # pass along a release number without the SHA in case somebody
@@ -172,8 +173,8 @@ macro(SET_PACKAGING_PARAMETERS)
       set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
       set(CONSOLE_SHORTCUT_NAME "Sandbox")
     else ()
-      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION}")
-      set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION}")
+      set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION_NO_SHA}")
+      set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
     endif ()
 
     set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")
diff --git a/cmake/templates/console-build-info.json.in b/cmake/templates/console-build-info.json.in
index c1ef010e08..6b4ee99292 100644
--- a/cmake/templates/console-build-info.json.in
+++ b/cmake/templates/console-build-info.json.in
@@ -1,4 +1,5 @@
 {
     "releaseType": "@RELEASE_TYPE@",
-    "buildIdentifier": "@BUILD_VERSION@" 
+    "buildIdentifier": "@BUILD_VERSION@",
+    "organization": "@BUILD_ORGANIZATION@" 
 }
diff --git a/server-console/src/main.js b/server-console/src/main.js
index b08db6222f..8a92fc8a5d 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -76,10 +76,7 @@ function getBuildInfo() {
 const buildInfo = getBuildInfo();
 
 function getRootHifiDataDirectory() {
-    var organization = "High Fidelity";
-    if (buildInfo.releaseType != "PRODUCTION") {
-        organization += ' - ' + buildInfo.buildIdentifier;
-    }
+    var organization = buildInfo.organization;
     if (osType == 'Windows_NT') {
         return path.resolve(osHomeDir(), 'AppData/Roaming', organization);
     } else if (osType == 'Darwin') {