Merge pull request nightscout#378 from dnzxy/fix-capture-build

Fix capture-build-details.sh to work with detached state or tags

scripts/capture-build-details.sh

@@ -1,40 +1,38 @@
 #!/bin/sh -e
-
 # capture-build-details.sh
 # Trio
 #
 # Created by Jonas Björkert on 2024-05-08.
-
 # Enable debugging if needed
 #set -x
-
 info_plist_path="${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/BuildDetails.plist"
-
 # Ensure the path to BuildDetails.plist is valid.
 if [ "${info_plist_path}" == "/" -o ! -e "${info_plist_path}" ]; then
  echo "BuildDetails.plist file does not exist at path: ${info_plist_path}" >&2
  exit 1
 else
  echo "Gathering build details..."
-
  # Capture the current date and write it to BuildDetails.plist
  plutil -replace com-trio-build-date -string "$(date)" "${info_plist_path}"
 
- # Retrieve the current branch
- git_branch=$(git symbolic-ref --short -q HEAD)
+ # Retrieve the current branch, if available
+ git_branch=$(git symbolic-ref --short -q HEAD || echo "")
 
  # Attempt to retrieve the current tag
  git_tag=$(git describe --tags --exact-match 2>/dev/null || echo "")
 
  # Retrieve the current SHA of the latest commit
  git_commit_sha=$(git log -1 --format="%h" --abbrev=7)
 
- # Determine the branch or tag information
+ # Determine the branch or tag information, or fallback to SHA if in detached state
  git_branch_or_tag="${git_branch:-${git_tag}}"
+ if [ -z "${git_branch_or_tag}" ]; then
+ git_branch_or_tag="detached"
+ fi
 
  # Update BuildDetails.plist with the branch or tag information
  plutil -replace com-trio-branch -string "${git_branch_or_tag}" "${info_plist_path}"
 
  # Update BuildDetails.plist with the SHA information
  plutil -replace com-trio-commit-sha -string "${git_commit_sha}" "${info_plist_path}"
-fi
+fi