updated build system

scripts/make_package.sh

@@ -12,6 +12,24 @@ function error_exit() {
   exit $2
 }
 
+function cleanup_packages() {
+  local SOURCE_FILE=$1
+
+  pushd "${PROJECT_DIST_DIR}"
+  if [ -f "${SOURCE_FILE}" ]; then
+    rm -f "${SOURCE_FILE}" || error_exit "failed to delete file: ${SOURCE_FILE}" 1
+  fi
+
+  if [ -f "${SOURCE_FILE}.sha256" ]; then
+    rm -f "${SOURCE_FILE}.sha256" || error_exit "failed to delete file: ${SOURCE_FILE}.sha256" 1
+  fi
+
+  if [ -f "${SOURCE_FILE}.sig" ]; then
+    rm -f "${SOURCE_FILE}.sig" || error_exit "failed to delete file: ${SOURCE_FILE}.sig" 1
+  fi
+  popd
+}
+
 function create_file_validations() {
   local SOURCE_FILE=$1
   sha256sum ${SOURCE_FILE} >${SOURCE_FILE}.sha256 || error_exit "failed to create sha256 for file: ${SOURCE_FILE}" 1
@@ -25,37 +43,9 @@ if [ ! -d "${PROJECT_DIST_DIR}" ]; then
   error_exit "dist directory not found: ${PROJECT_DIST_DIR}" 2
 fi
 
-pushd "${PROJECT_DIST_DIR}"
-if [ -f "${PROJECT_OUT_FILE}" ]; then
-  rm -f "${PROJECT_OUT_FILE}" || error_exit "failed to delete file: ${PROJECT_OUT_FILE}" 1
-fi
-if [ -f "${PROJECT_OUT_FILE}.sha256" ]; then
-  rm -f "${PROJECT_OUT_FILE}.sha256" || error_exit "failed to delete file: ${PROJECT_OUT_FILE}.sha256" 1
-fi
-if [ -f "${PROJECT_OUT_FILE}.sig" ]; then
-  rm -f "${PROJECT_OUT_FILE}.sig" || error_exit "failed to delete file: ${PROJECT_OUT_FILE}.sig" 1
-fi
-
-if [ -f "${PROJECT_FILE_PART}_setup.exe" ]; then
-  rm -f "${PROJECT_FILE_PART}_setup.exe" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe" 1
-fi
-if [ -f "${PROJECT_FILE_PART}_setup.exe.sha256" ]; then
-  rm -f "${PROJECT_FILE_PART}_setup.exe.sha256" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe.sha256" 1
-fi
-if [ -f "${PROJECT_FILE_PART}_setup.exe.sig" ]; then
-  rm -f "${PROJECT_FILE_PART}_setup.exe.sig" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe.sig" 1
-fi
-
-if [ -f "${PROJECT_FILE_PART}.dmg" ]; then
-  rm -f "${PROJECT_FILE_PART}.dmg" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe" 1
-fi
-if [ -f "${PROJECT_FILE_PART}.dmg.sha256" ]; then
-  rm -f "${PROJECT_FILE_PART}.dmg.sha256" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe.sha256" 1
-fi
-if [ -f "${PROJECT_FILE_PART}.dmg.sig" ]; then
-  rm -f "${PROJECT_FILE_PART}.dmg.sig" || error_exit "failed to delete file: ${PROJECT_FILE_PART}_setup.exe.sig" 1
-fi
-popd
+cleanup_packages "${PROJECT_OUT_FILE}"
+cleanup_packages "${PROJECT_FILE_PART}_setup.exe"
+cleanup_packages "${PROJECT_FILE_PART}.dmg"
 
 rsync -av --progress ${PROJECT_DIST_DIR}/ ${TEMP_DIR}/${PROJECT_NAME}/ || error_exit "failed to rsync" 1
 
@@ -110,19 +100,11 @@ if [ -d "${TEMP_DIR}/${PROJECT_NAME}/${PROJECT_NAME}.app" ]; then
 
   ln -s /Applications "${DMG_ROOT}/Applications" 2>/dev/null || true
 
-  BUNDLE_ID="$(/usr/bin/defaults read "${APP_SRC}/Contents/Info" CFBundleIdentifier 2>/dev/null || true)"
-  if [ -z "${BUNDLE_ID}" ] && [ -f "${APP_SRC}/Contents/Info.plist" ]; then
-    BUNDLE_ID="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleIdentifier' "${APP_SRC}/Contents/Info.plist" 2>/dev/null || true)"
-  fi
-  if [ -z "${BUNDLE_ID}" ]; then
-    BUNDLE_ID="${PROJECT_MACOS_BUNDLE_ID:-com.example.${PROJECT_NAME}}"
-  fi
-
   if [ -f "${INSTALLER_SRC}" ]; then
     cp -f "${INSTALLER_SRC}" "${INSTALLER}" || error_exit "failed to copy install command" 1
     chmod +x "${INSTALLER}" || error_exit "failed to chmod install command" 1
 
-    SAFE_PREFIX="$(printf '%s' "${BUNDLE_ID}" | sed -e 's/[\/&]/\\&/g')"
+    SAFE_PREFIX="$(printf '%s' "${PROJECT_MACOS_BUNDLE_ID}" | sed -e 's/[\/&]/\\&/g')"
     /usr/bin/sed -i '' -e "s|^LABEL_PREFIX=.*$|LABEL_PREFIX=\"${SAFE_PREFIX}\"|g" "${INSTALLER}"
 
     LABEL_ASSIGNED="$(/usr/bin/awk -F= '/^LABEL_PREFIX=/{sub(/^[^=]*=/,""); gsub(/^"|"$/,""); print; exit}' "${INSTALLER}")"
@@ -134,7 +116,7 @@ if [ -d "${TEMP_DIR}/${PROJECT_NAME}/${PROJECT_NAME}.app" ]; then
           if (v !~ /\./) exit 1;
           exit 0;
         }'; then
-      error_exit "DMG build abort: invalid LABEL_PREFIX written to installer (value: \"${LABEL_ASSIGNED}\"). Check BUNDLE_ID and sed substitution." 1
+      error_exit "DMG build abort: invalid LABEL_PREFIX written to installer (value: \"${LABEL_ASSIGNED}\"). Check PROJECT_MACOS_BUNDLE_ID and sed substitution." 1
     fi
   fi