diff --git a/cmake/macros/SetPackagingParameters.cmake b/cmake/macros/SetPackagingParameters.cmake
index 0f8975e9b5..164d326b20 100644
--- a/cmake/macros/SetPackagingParameters.cmake
+++ b/cmake/macros/SetPackagingParameters.cmake
@@ -18,7 +18,7 @@ macro(SET_PACKAGING_PARAMETERS)
set(BUILD_GLOBAL_SERVICES "DEVELOPMENT")
set(USE_STABLE_GLOBAL_SERVICES 0)
set(BUILD_NUMBER 0)
- set(APP_USER_MODEL_ID "com.highfidelity.sandbox-dev")
+ set(APP_USER_MODEL_ID "com.highfidelity.console")
set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")
@@ -176,15 +176,15 @@ macro(SET_PACKAGING_PARAMETERS)
# shortcut names
if (PRODUCTION_BUILD)
set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface")
- set(CONSOLE_SHORTCUT_NAME "Sandbox")
- set(APP_USER_MODEL_ID "com.highfidelity.sandbox")
+ set(CONSOLE_SHORTCUT_NAME "High Fidelity Console")
+ set(APP_USER_MODEL_ID "com.highfidelity.console")
else ()
set(INTERFACE_SHORTCUT_NAME "High Fidelity Interface - ${BUILD_VERSION_NO_SHA}")
- set(CONSOLE_SHORTCUT_NAME "Sandbox - ${BUILD_VERSION_NO_SHA}")
+ set(CONSOLE_SHORTCUT_NAME "High Fidelity Console - ${BUILD_VERSION_NO_SHA}")
endif ()
set(INTERFACE_HF_SHORTCUT_NAME "${INTERFACE_SHORTCUT_NAME}")
- set(CONSOLE_HF_SHORTCUT_NAME "High Fidelity ${CONSOLE_SHORTCUT_NAME}")
+ set(CONSOLE_HF_SHORTCUT_NAME "${CONSOLE_SHORTCUT_NAME}")
set(PRE_SANDBOX_INTERFACE_SHORTCUT_NAME "High Fidelity")
set(PRE_SANDBOX_CONSOLE_SHORTCUT_NAME "Server Console")
diff --git a/cmake/templates/CPackProperties.cmake.in b/cmake/templates/CPackProperties.cmake.in
index 1d7effd18f..0a56181138 100644
--- a/cmake/templates/CPackProperties.cmake.in
+++ b/cmake/templates/CPackProperties.cmake.in
@@ -13,7 +13,7 @@ set(INTERFACE_DISPLAY_NAME "Interface")
set(INTERFACE_SHORTCUT_NAME "@INTERFACE_SHORTCUT_NAME@")
set(INTERFACE_HF_SHORTCUT_NAME "@INTERFACE_HF_SHORTCUT_NAME@")
set(INTERFACE_WIN_EXEC_NAME "@INTERFACE_EXEC_PREFIX@.exe")
-set(CONSOLE_DISPLAY_NAME "Sandbox")
+set(CONSOLE_DISPLAY_NAME "Console")
set(CONSOLE_INSTALL_SUBDIR "@CONSOLE_INSTALL_DIR@")
set(CONSOLE_SHORTCUT_NAME "@CONSOLE_SHORTCUT_NAME@")
set(CONSOLE_HF_SHORTCUT_NAME "@CONSOLE_HF_SHORTCUT_NAME@")
diff --git a/cmake/templates/NSIS.template.in b/cmake/templates/NSIS.template.in
index 7f6884f478..b7564f45e5 100644
--- a/cmake/templates/NSIS.template.in
+++ b/cmake/templates/NSIS.template.in
@@ -405,6 +405,14 @@ Var GAClientID
Section "-Previous Install Cleanup"
; Remove the resources folder so we don't end up including removed QML files
RMDir /r "$INSTDIR\resources"
+
+ ; delete old assignment-client and domain-server so they're no longer present
+ ; in client only installs.
+ Delete "$INSTDIR\@DS_EXEC_NAME@"
+ Delete "$INSTDIR\@AC_EXEC_NAME@"
+
+ ; delete interface so it's not there for server-only installs
+ Delete "$INSTDIR\@INTERFACE_WIN_EXEC_NAME@"
SectionEnd
@CPACK_NSIS_INSTALLATION_TYPES@
@@ -532,9 +540,9 @@ SectionEnd
Var PostInstallDialog
Var DesktopClientCheckbox
-Var DesktopServerCheckbox
-Var ServerStartupCheckbox
-Var LaunchServerNowCheckbox
+Var DesktopConsoleCheckbox
+Var ConsoleStartupCheckbox
+Var LaunchConsoleNowCheckbox
Var LaunchClientNowCheckbox
Var CleanInstallCheckbox
Var CurrentOffset
@@ -746,28 +754,8 @@ Function PostInstallOptionsPage
!insertmacro SetInstallOption $DesktopClientCheckbox @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ ${BST_CHECKED}
${EndIf}
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@"
- Pop $DesktopServerCheckbox
- IntOp $CurrentOffset $CurrentOffset + 15
-
- ; set the checkbox state depending on what is present in the registry
- !insertmacro SetInstallOption $DesktopServerCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
- ${EndIf}
-
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ after install"
- Pop $LaunchServerNowCheckbox
-
- ; set the checkbox state depending on what is present in the registry
- !insertmacro SetInstallOption $LaunchServerNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
- ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
- ${IfNot} $substringResult == ""
- ${NSD_SetState} $LaunchServerNowCheckbox ${BST_UNCHECKED}
- ${EndIf}
-
- IntOp $CurrentOffset $CurrentOffset + 15
- ${EndIf}
+ ; set the checkbox state depending on what is present in the registry
+ !insertmacro SetInstallOption $DesktopConsoleCheckbox @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ ${BST_UNCHECKED}
${If} @CLIENT_COMPONENT_CONDITIONAL@
${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @INTERFACE_HF_SHORTCUT_NAME@ after install"
@@ -782,28 +770,42 @@ Function PostInstallOptionsPage
${EndIf}
${EndIf}
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup"
- Pop $ServerStartupCheckbox
- IntOp $CurrentOffset $CurrentOffset + 15
+ ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Create a desktop shortcut for @CONSOLE_HF_SHORTCUT_NAME@"
+ Pop $DesktopConsoleCheckbox
+ IntOp $CurrentOffset $CurrentOffset + 15
- ; set the checkbox state depending on what is present in the registry
- !insertmacro SetInstallOption $ServerStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
+ ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ after install"
+ Pop $LaunchConsoleNowCheckbox
+
+ ; set the checkbox state depending on what is present in the registry
+ !insertmacro SetInstallOption $LaunchConsoleNowCheckbox @SERVER_LAUNCH_NOW_REG_KEY@ ${BST_CHECKED}
+ ${StrContains} $substringResult "/forceNoLaunchServer" $CMDLINE
+ ${IfNot} $substringResult == ""
+ ${NSD_SetState} $LaunchConsoleNowCheckbox ${BST_UNCHECKED}
${EndIf}
+ IntOp $CurrentOffset $CurrentOffset + 15
+
+ ${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Launch @CONSOLE_HF_SHORTCUT_NAME@ on startup"
+ Pop $ConsoleStartupCheckbox
+ IntOp $CurrentOffset $CurrentOffset + 15
+
+ ; set the checkbox state depending on what is present in the registry
+ !insertmacro SetInstallOption $ConsoleStartupCheckbox @CONSOLE_STARTUP_REG_KEY@ ${BST_CHECKED}
+
${NSD_CreateCheckbox} 0 $CurrentOffset$OffsetUnits 100% 10u "&Perform a clean install (Delete older settings and content)"
Pop $CleanInstallCheckbox
IntOp $CurrentOffset $CurrentOffset + 15
${If} @PR_BUILD@ == 1
- ; a PR build defaults all install options expect LaunchServerNowCheckbox, LaunchClientNowCheckbox and the settings copy to unchecked
+ ; a PR build defaults all install options expect LaunchConsoleNowCheckbox, LaunchClientNowCheckbox and the settings copy to unchecked
${If} @CLIENT_COMPONENT_CONDITIONAL@
${NSD_SetState} $DesktopClientCheckbox ${BST_UNCHECKED}
${EndIf}
${If} @SERVER_COMPONENT_CONDITIONAL@
- ${NSD_SetState} $DesktopServerCheckbox ${BST_UNCHECKED}
- ${NSD_SetState} $ServerStartupCheckbox ${BST_UNCHECKED}
+ ${NSD_SetState} $DesktopConsoleCheckbox ${BST_UNCHECKED}
+ ${NSD_SetState} $ConsoleStartupCheckbox ${BST_UNCHECKED}
${EndIf}
; push the offset
@@ -824,9 +826,9 @@ FunctionEnd
!macroend
Var DesktopClientState
-Var DesktopServerState
-Var ServerStartupState
-Var LaunchServerNowState
+Var DesktopConsoleState
+Var ConsoleStartupState
+Var LaunchConsoleNowState
Var LaunchClientNowState
Var CopyFromProductionState
Var CleanInstallState
@@ -842,11 +844,11 @@ Function ReadInstallTypes
StrCpy $Express "1"
StrCpy $DesktopClientState ${BST_CHECKED}
- StrCpy $ServerStartupState ${BST_CHECKED}
- StrCpy $LaunchServerNowState ${BST_CHECKED}
+ StrCpy $ConsoleStartupState ${BST_CHECKED}
+ StrCpy $LaunchConsoleNowState ${BST_CHECKED}
StrCpy $LaunchClientNowState ${BST_CHECKED}
StrCpy $CleanInstallState ${BST_UNCHECKED}
- StrCpy $DesktopServerState ${BST_UNCHECKED}
+ StrCpy $DesktopConsoleState ${BST_UNCHECKED}
${If} @PR_BUILD@ == 1
StrCpy $CopyFromProductionState ${BST_UNCHECKED}
@@ -860,28 +862,25 @@ Function ReadInstallTypes
FunctionEnd
Function ReadPostInstallOptions
+
+ ; check if the user asked for a desktop shortcut to console
+ ${NSD_GetState} $DesktopConsoleCheckbox $DesktopConsoleState
+
+ ; check if the user asked to have console launched every startup
+ ${NSD_GetState} $ConsoleStartupCheckbox $ConsoleStartupState
+
${If} @CLIENT_COMPONENT_CONDITIONAL@
; check if the user asked for a desktop shortcut to High Fidelity
${NSD_GetState} $DesktopClientCheckbox $DesktopClientState
${EndIf}
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ; check if the user asked for a desktop shortcut to Sandbox
- ${NSD_GetState} $DesktopServerCheckbox $DesktopServerState
-
- ; check if the user asked to have Sandbox launched every startup
- ${NSD_GetState} $ServerStartupCheckbox $ServerStartupState
- ${EndIf}
-
${If} @PR_BUILD@ == 1
; check if we need to copy settings/content from production for this PR build
${NSD_GetState} $CopyFromProductionCheckbox $CopyFromProductionState
${EndIf}
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ; check if we need to launch the server post-install
- ${NSD_GetState} $LaunchServerNowCheckbox $LaunchServerNowState
- ${EndIf}
+ ; check if we need to launch the console post-install
+ ${NSD_GetState} $LaunchConsoleNowCheckbox $LaunchConsoleNowState
${If} @CLIENT_COMPONENT_CONDITIONAL@
; check if we need to launch the client post-install
@@ -893,6 +892,17 @@ Function ReadPostInstallOptions
FunctionEnd
Function HandlePostInstallOptions
+
+ ; check if the user asked for a desktop shortcut to the console
+ ${If} $DesktopConsoleState == ${BST_CHECKED}
+ CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
+ !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
+ ; Set appUserModelId
+ ApplicationID::Set "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
+ ${Else}
+ !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
+ ${EndIf}
+
${If} @CLIENT_COMPONENT_CONDITIONAL@
; check if the user asked for a desktop shortcut to High Fidelity
${If} $DesktopClientState == ${BST_CHECKED}
@@ -901,38 +911,24 @@ Function HandlePostInstallOptions
${Else}
!insertmacro WriteInstallOption @CLIENT_DESKTOP_SHORTCUT_REG_KEY@ NO
${EndIf}
-
${EndIf}
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ; check if the user asked for a desktop shortcut to Sandbox
- ${If} $DesktopServerState == ${BST_CHECKED}
- CreateShortCut "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
- !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ YES
- ; Set appUserModelId
- ApplicationID::Set "$DESKTOP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
- ${Else}
- !insertmacro WriteInstallOption @CONSOLE_DESKTOP_SHORTCUT_REG_KEY@ NO
- ${EndIf}
+ ; check if the user asked to have Console launched every startup
+ ${If} $ConsoleStartupState == ${BST_CHECKED}
+ ; in case we added a shortcut in the global context, pull that now
+ SetShellVarContext all
+ Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
+ ; make a startup shortcut in this user's current context
+ SetShellVarContext current
+ CreateShortCut "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
- ; check if the user asked to have Sandbox launched every startup
- ${If} $ServerStartupState == ${BST_CHECKED}
- ; in case we added a shortcut in the global context, pull that now
- SetShellVarContext all
- Delete "$SMSTARTUP\@PRE_SANDBOX_CONSOLE_SHORTCUT_NAME@.lnk"
+ ; reset the shell var context back
+ SetShellVarContext all
- ; make a startup shortcut in this user's current context
- SetShellVarContext current
- CreateShortCut "$SMSTARTUP\@CONSOLE_HF_SHORTCUT_NAME@.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
-
- ; reset the shell var context back
- SetShellVarContext all
-
- !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ YES
- ${Else}
- !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ NO
- ${EndIf}
+ !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ YES
+ ${Else}
+ !insertmacro WriteInstallOption @CONSOLE_STARTUP_REG_KEY@ NO
${EndIf}
; check if the user asked for a clean install
@@ -982,16 +978,15 @@ Function HandlePostInstallOptions
${EndIf}
${EndIf}
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- ${AndIf} $LaunchServerNowState == ${BST_CHECKED}
+ ${If} $LaunchConsoleNowState == ${BST_CHECKED}
!insertmacro WriteInstallOption @SERVER_LAUNCH_NOW_REG_KEY@ YES
; both launches use the explorer trick in case the user has elevated permissions for the installer
${If} $LaunchClientNowState == ${BST_CHECKED}
!insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ YES
; create shortcut with ARGUMENTS
- CreateShortCut "$TEMP\SandboxShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface"
- Exec '"$WINDIR\explorer.exe" "$TEMP\SandboxShortcut.lnk"'
+ CreateShortCut "$TEMP\ConsoleShortcut.lnk" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@" "-- --launchInterface"
+ Exec '"$WINDIR\explorer.exe" "$TEMP\ConsoleShortcut.lnk"'
${Else}
!insertmacro WriteInstallOption @CLIENT_LAUNCH_NOW_REG_KEY@ NO
Exec '"$WINDIR\explorer.exe" "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"'
@@ -1164,13 +1159,11 @@ Section "-Core installation"
${EndIf}
- ; Conditional handling for server console shortcut
- ${If} @SERVER_COMPONENT_CONDITIONAL@
- CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" \
- "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
- ; Set appUserModelId
- ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
- ${EndIf}
+ ; handling for server console shortcut
+ CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" \
+ "$INSTDIR\@CONSOLE_INSTALL_SUBDIR@\@CONSOLE_WIN_EXEC_NAME@"
+ ; Set appUserModelId
+ ApplicationID::Set "$SMPROGRAMS\$STARTMENU_FOLDER\@CONSOLE_SHORTCUT_NAME@.lnk" "@APP_USER_MODEL_ID@"
CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\@UNINSTALLER_NAME@"
diff --git a/server-console/CMakeLists.txt b/server-console/CMakeLists.txt
index 1c6e40c582..bdcefda5d8 100644
--- a/server-console/CMakeLists.txt
+++ b/server-console/CMakeLists.txt
@@ -19,7 +19,7 @@ set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Server Console")
set_target_properties(${TARGET_NAME}-npm-install PROPERTIES FOLDER "hidden/Server Console")
# add a dependency from the package target to the server components
-add_dependencies(${TARGET_NAME} assignment-client domain-server)
+add_dependencies(${TARGET_NAME} assignment-client domain-server interface)
# set the packaged console folder depending on platform, so we can copy it
if (APPLE)
@@ -36,6 +36,7 @@ if (APPLE)
PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT}
+ COMPONENT ${CLIENT_COMPONENT}
)
elseif (WIN32)
set(CONSOLE_DESTINATION "${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER}")
@@ -44,6 +45,7 @@ elseif (WIN32)
DIRECTORY "${CONSOLE_DESTINATION}/"
DESTINATION ${CONSOLE_INSTALL_DIR}
COMPONENT ${SERVER_COMPONENT}
+ COMPONENT ${CLIENT_COMPONENT}
)
# sign the copied server console executable after install
diff --git a/server-console/src/main.js b/server-console/src/main.js
index 95b5935255..08692fbd50 100644
--- a/server-console/src/main.js
+++ b/server-console/src/main.js
@@ -104,12 +104,12 @@ userConfig.load(configPath);
const ipcMain = electron.ipcMain;
-function isServerInstalled() {
- return interfacePath && userConfig.get("serverInstalled", true);
+function isInterfaceInstalled() {
+ return interfacePath;
}
-function isInterfaceInstalled() {
- return dsPath && acPath && userConfig.get("interfaceInstalled", true);
+function isServerInstalled() {
+ return dsPath && acPath;
}
var isShuttingDown = false;
@@ -263,6 +263,10 @@ interfacePath = pathFinder.discoveredPath("Interface", binaryType, buildInfo.rel
dsPath = pathFinder.discoveredPath("domain-server", binaryType, buildInfo.releaseType);
acPath = pathFinder.discoveredPath("assignment-client", binaryType, buildInfo.releaseType);
+console.log("Domain Server Path: " + dsPath);
+console.log("Assignment Client Path: " + acPath);
+console.log("Interface Path: " + interfacePath);
+
function binaryMissingMessage(displayName, executableName, required) {
var message = "The " + displayName + " executable was not found.\n";
@@ -286,18 +290,6 @@ function binaryMissingMessage(displayName, executableName, required) {
return message;
}
-// if at this point any of the paths are null, we're missing something we wanted to find
-
-if (!dsPath) {
- dialog.showErrorBox("Domain Server Not Found", binaryMissingMessage("domain-server", "domain-server", true));
- app.exit(0);
-}
-
-if (!acPath) {
- dialog.showErrorBox("Assignment Client Not Found", binaryMissingMessage("assignment-client", "assignment-client", true));
- app.exit(0);
-}
-
function openFileBrowser(path) {
// Add quotes around path
path = '"' + path + '"';
@@ -815,33 +807,33 @@ function onContentLoaded() {
// Disable splash window for now.
// maybeShowSplash();
- if (buildInfo.releaseType == 'PRODUCTION' && !argv.noUpdater) {
-
- const CHECK_FOR_UPDATES_INTERVAL_SECONDS = 60 * 30;
- var hasShownUpdateNotification = false;
- const updateChecker = new updater.UpdateChecker(buildInfo, CHECK_FOR_UPDATES_INTERVAL_SECONDS);
- updateChecker.on('update-available', function(latestVersion, url) {
- if (!hasShownUpdateNotification) {
- notifier.notify({
- icon: notificationIcon,
- title: 'An update is available!',
- message: 'High Fidelity version ' + latestVersion + ' is available',
- wait: true,
- appID: buildInfo.appUserModelId,
- url: url
- });
- hasShownUpdateNotification = true;
- }
- });
- notifier.on('click', function(notifierObject, options) {
- log.debug("Got click", options.url);
- shell.openExternal(options.url);
- });
- }
-
- deleteOldFiles(logPath, DELETE_LOG_FILES_OLDER_THAN_X_SECONDS, LOG_FILE_REGEX);
-
if (isServerInstalled()) {
+ if (buildInfo.releaseType == 'PRODUCTION' && !argv.noUpdater) {
+
+ const CHECK_FOR_UPDATES_INTERVAL_SECONDS = 60 * 30;
+ var hasShownUpdateNotification = false;
+ const updateChecker = new updater.UpdateChecker(buildInfo, CHECK_FOR_UPDATES_INTERVAL_SECONDS);
+ updateChecker.on('update-available', function(latestVersion, url) {
+ if (!hasShownUpdateNotification) {
+ notifier.notify({
+ icon: notificationIcon,
+ title: 'An update is available!',
+ message: 'High Fidelity version ' + latestVersion + ' is available',
+ wait: true,
+ appID: buildInfo.appUserModelId,
+ url: url
+ });
+ hasShownUpdateNotification = true;
+ }
+ });
+ notifier.on('click', function(notifierObject, options) {
+ log.debug("Got click", options.url);
+ shell.openExternal(options.url);
+ });
+ }
+
+ deleteOldFiles(logPath, DELETE_LOG_FILES_OLDER_THAN_X_SECONDS, LOG_FILE_REGEX);
+
var dsArguments = ['--get-temp-name',
'--parent-pid', process.pid];
domainServer = new Process('domain-server', dsPath, dsArguments, logPath);
diff --git a/server-console/src/modules/hf-app.js b/server-console/src/modules/hf-app.js
index 625715b392..1b1171baef 100644
--- a/server-console/src/modules/hf-app.js
+++ b/server-console/src/modules/hf-app.js
@@ -34,7 +34,7 @@ exports.getBuildInfo = function() {
buildNumber: "0",
stableBuild: "0",
organization: "High Fidelity - dev",
- appUserModelId: "com.highfidelity.sandbox-dev"
+ appUserModelId: "com.highfidelity.console"
};
var buildInfo = DEFAULT_BUILD_INFO;