From acf5ac0d7b3cd5b4a1b8cef2c0f4fc02e9d0f7fe Mon Sep 17 00:00:00 2001
From: Daniel Masato <masatod@amazon.com>
Date: Sun, 19 Apr 2020 19:37:07 +0100
Subject: [PATCH] Small message and artifact name refactoring

---
 mac/deploy.sh              | 4 ++--
 mac/deployment_settings.py | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mac/deploy.sh b/mac/deploy.sh
index ee74898b..e494dd02 100755
--- a/mac/deploy.sh
+++ b/mac/deploy.sh
@@ -3,7 +3,7 @@ set -e
 
 APP_NAME="Jamulus"
 SERVER_NAME="${APP_NAME}Server"
-INSTALLER_NAME="${APP_NAME}Installer"
+INSTALLER_NAME="${APP_NAME}-installer"
 ROOT_PATH="$(pwd)"
 MAC_PATH="${ROOT_PATH}/mac"
 RES_PATH="${ROOT_PATH}/src/res"
@@ -54,4 +54,4 @@ build_app "${SERVER_NAME}" "DEFINES+=SERVER_BUNDLE"
 # Build installer image
 "${DMGBUILD_BIN}" -s "${MAC_PATH}/deployment_settings.py" -D background="${RES_PATH}/installerbackground.png" \
     -D app_path="${DEPLOY_PATH}/${APP_NAME}.app" -D server_path="${DEPLOY_PATH}/${SERVER_NAME}.app" \
-    -D license="${ROOT_PATH}/COPYING" "${APP_NAME} Installer" "${DEPLOY_PATH}/${INSTALLER_NAME}-${APP_VERSION}.dmg"
+    -D license="${ROOT_PATH}/COPYING" "${INSTALLER_NAME}" "${DEPLOY_PATH}/${INSTALLER_NAME}-${APP_VERSION}-mac.dmg"
diff --git a/mac/deployment_settings.py b/mac/deployment_settings.py
index 2ceb4b3a..b552eebf 100644
--- a/mac/deployment_settings.py
+++ b/mac/deployment_settings.py
@@ -18,7 +18,7 @@ def validate_key_path(key, example):
 
     if value is None:
         raise ValueError("The " + key + " key must be specified.\n"
-                         "Example: dmgbuild -D " + key + "=" + example + "...")
+                         "Example: dmgbuild -D " + key + "=" + example + " ...")
 
     if not os.path.exists(value):
         raise ValueError("The " + key + " key must be a valid path.")