From b526079cb4c893ed27e93bfbdc7685c0cdc5059b Mon Sep 17 00:00:00 2001
From: Allen Houchins <32207388+allenhouchins@users.noreply.github.com>
Date: Mon, 10 Nov 2025 15:47:37 -0600
Subject: [PATCH] Update generate-icons.sh to find app icon by name (#35410)

Currently the `generate-icons.sh` script picks out the first icns file
by name alphabetically. This is problematic for apps that contain
multiple icns files in their Resources folder (ex: Microsoft Outlook).
This update reads the actual filename used by the app in Info.plist
(CFBundleIconFile) and finds that file by name in the Resources folder.


<!-- Add the related story/sub-task/bug number, like Resolves #123, or
remove if NA -->
**Related issue:** Resolves #

# Checklist for submitter

If some of the following don't apply, delete the relevant line.

- [ ] Changes file added for user-visible changes in `changes/`,
`orbit/changes/` or `ee/fleetd-chrome/changes`.
See [Changes
files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files)
for more information.

- [ ] Input data is properly validated, `SELECT *` is avoided, SQL
injection is prevented (using placeholders for values in statements)
- [ ] If paths of existing endpoints are modified without backwards
compatibility, checked the frontend/CLI for any necessary changes

## Testing

- [ ] Added/updated automated tests
- [ ] Where appropriate, [automated tests simulate multiple hosts and
test for host
isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing)
(updates to one hosts's records do not affect another)

- [ ] QA'd all new/changed functionality manually

For unreleased bug fixes in a release candidate, one of:

- [ ] Confirmed that the fix is not expected to adversely impact load
test results
- [ ] Alerted the release DRI if additional load testing is needed

## Database migrations

- [ ] Checked schema for all modified table for columns that will
auto-update timestamps during migration.
- [ ] Confirmed that updating the timestamps is acceptable, and will not
cause unwanted side effects.
- [ ] Ensured the correct collation is explicitly set for character
columns (`COLLATE utf8mb4_unicode_ci`).

## New Fleet configuration settings

- [ ] Setting(s) is/are explicitly excluded from GitOps

If you didn't check the box above, follow this checklist for
GitOps-enabled settings:

- [ ] Verified that the setting is exported via `fleetctl
generate-gitops`
- [ ] Verified the setting is documented in a separate PR to [the GitOps
documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485)
- [ ] Verified that the setting is cleared on the server if it is not
supplied in a YAML file (or that it is documented as being optional)
- [ ] Verified that any relevant UI is disabled when GitOps mode is
enabled

## fleetd/orbit/Fleet Desktop

- [ ] Verified compatibility with the latest released version of Fleet
(see [Must
rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md))
- [ ] If the change applies to only one platform, confirmed that
`runtime.GOOS` is used as needed to isolate changes
- [ ] Verified that fleetd runs on macOS, Linux and Windows
- [ ] Verified auto-update works from the released version of component
to the new version (see [tools/tuf/test](../tools/tuf/test/README.md))
---
 tools/software/icons/generate-icons.sh | 29 ++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/tools/software/icons/generate-icons.sh b/tools/software/icons/generate-icons.sh
index cc1320a1ee..24ad9dd8a3 100755
--- a/tools/software/icons/generate-icons.sh
+++ b/tools/software/icons/generate-icons.sh
@@ -44,13 +44,34 @@ if [[ -z "$SLUG" || -z "$APP_PATH" ]]; then
   exit 1
 fi
 
-# Find the first .icns file in the app bundle
-ICNS_PATH=$(find "$APP_PATH/Contents/Resources" -maxdepth 1 -name "*.icns" | head -n 1 || true)
-if [[ ! -f "$ICNS_PATH" ]]; then
-  echo "Error: .icns file not found in $APP_PATH"
+# Read Info.plist to get the icon file name
+INFO_PLIST="$APP_PATH/Contents/Info.plist"
+if [[ ! -f "$INFO_PLIST" ]]; then
+  echo "Error: Info.plist not found at $INFO_PLIST"
   exit 1
 fi
 
+# Extract CFBundleIconFile from Info.plist
+ICON_FILE=$(defaults read "$INFO_PLIST" CFBundleIconFile 2>/dev/null || plutil -extract CFBundleIconFile raw "$INFO_PLIST" 2>/dev/null || echo "")
+if [[ -z "$ICON_FILE" ]]; then
+  echo "Error: CFBundleIconFile not found in Info.plist"
+  exit 1
+fi
+
+# Handle case where extension might or might not be included
+if [[ "$ICON_FILE" != *.icns ]]; then
+  ICON_FILE="${ICON_FILE}.icns"
+fi
+
+# Find the exact icon file in Resources folder
+ICNS_PATH="$APP_PATH/Contents/Resources/$ICON_FILE"
+if [[ ! -f "$ICNS_PATH" ]]; then
+  echo "Error: Icon file '$ICON_FILE' not found in $APP_PATH/Contents/Resources"
+  exit 1
+fi
+
+echo "Using icon file: $ICON_FILE"
+
 # Extract iconset
 TMP_DIR=$(mktemp -d)
 ICON_DIR="$TMP_DIR/icons.iconset"