-
Notifications
You must be signed in to change notification settings - Fork 973
Update Fleet-maintained apps #45503
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Update Fleet-maintained apps #45503
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
34b49d0
Update Fleet-maintained apps.
allenhouchins 15be004
Handle per-user Docker Desktop install/uninstall
allenhouchins 3f7d311
Camtasia version transformer: handle full-year
allenhouchins f36e7ac
Add Camtasia uninstall script and update refs
allenhouchins 8408e69
Merge branch 'main' into fma-2605141636
allenhouchins File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
13 changes: 12 additions & 1 deletion
13
ee/maintained-apps/ingesters/homebrew/external_refs/camtasia_version_transformer.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,24 @@ | ||
| package externalrefs | ||
|
|
||
| import ( | ||
| "regexp" | ||
|
|
||
| maintained_apps "github.com/fleetdm/fleet/v4/ee/maintained-apps" | ||
| ) | ||
|
|
||
| // yearPrefixedCamtasiaVersion matches bundle_short_version values osquery reports | ||
| // for recent Camtasia releases (e.g. 2026.1.0). Homebrew historically reported | ||
| // two-digit year segments (26.1.0); newer cask metadata uses the full year | ||
| // (2026.1.0). Only prepend "20" when the version is not already year-prefixed. | ||
| var yearPrefixedCamtasiaVersion = regexp.MustCompile(`^20\d{2}\.`) | ||
|
|
||
| // CamtasiaVersionTransformer prepends "20" to the version to match what osquery reports. | ||
| // Homebrew reports "26.0.2" but osquery reports "2026.0.2" (year-based versioning). | ||
| // This ensures the output always contains the real version that osquery reports. | ||
| // When Homebrew already reports "2026.1.0", leave the version unchanged. | ||
| func CamtasiaVersionTransformer(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) { | ||
| if yearPrefixedCamtasiaVersion.MatchString(app.Version) { | ||
| return app, nil | ||
| } | ||
| app.Version = "20" + app.Version | ||
| return app, nil | ||
| } |
27 changes: 27 additions & 0 deletions
27
ee/maintained-apps/ingesters/homebrew/external_refs/camtasia_version_transformer_test.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| package externalrefs | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| maintained_apps "github.com/fleetdm/fleet/v4/ee/maintained-apps" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
| func TestCamtasiaVersionTransformer(t *testing.T) { | ||
| tests := []struct { | ||
| in, want string | ||
| }{ | ||
| {"26.1.0", "2026.1.0"}, | ||
| {"26.0.2", "2026.0.2"}, | ||
| {"2026.1.0", "2026.1.0"}, | ||
| {"2025.12.0", "2025.12.0"}, | ||
| } | ||
| for _, tt := range tests { | ||
| t.Run(tt.in, func(t *testing.T) { | ||
| app := &maintained_apps.FMAManifestApp{Version: tt.in} | ||
| out, err := CamtasiaVersionTransformer(app) | ||
| assert.NoError(t, err) | ||
|
Check failure on line 23 in ee/maintained-apps/ingesters/homebrew/external_refs/camtasia_version_transformer_test.go
|
||
| assert.Equal(t, tt.want, out.Version) | ||
| }) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletions
41
ee/maintained-apps/inputs/homebrew/scripts/camtasia_uninstall.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| #!/bin/bash | ||
|
|
||
| # variables | ||
| APPDIR="/Applications/" | ||
| LOGGED_IN_USER=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }') | ||
| # functions | ||
|
|
||
| trash() { | ||
| local logged_in_user="$1" | ||
| local target_file="$2" | ||
| local timestamp="$(date +%Y-%m-%d-%s)" | ||
| local rand="$(jot -r 1 0 99999)" | ||
|
|
||
| # replace ~ with /Users/$logged_in_user | ||
| if [[ "$target_file" == ~* ]]; then | ||
| target_file="/Users/$logged_in_user${target_file:1}" | ||
| fi | ||
|
|
||
| local trash="/Users/$logged_in_user/.Trash" | ||
| local file_name="$(basename "${target_file}")" | ||
|
|
||
| if [[ -e "$target_file" ]]; then | ||
| echo "removing $target_file." | ||
| mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}" | ||
| else | ||
| echo "$target_file doesn't exist." | ||
| fi | ||
| } | ||
|
|
||
| sudo rm -rf "$APPDIR/Camtasia.app" | ||
| trash $LOGGED_IN_USER '/Users/Shared/TechSmith/Camtasia' | ||
| trash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.techsmith.camtasia26.sfl*' | ||
| trash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.techsmith.camtasia2026.sfl*' | ||
| trash $LOGGED_IN_USER '~/Library/Application Support/TechSmith/Camtasia*' | ||
| trash $LOGGED_IN_USER '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.techsmith.camtasia*' | ||
| trash $LOGGED_IN_USER '~/Library/Caches/com.techsmith.camtasia*' | ||
| trash $LOGGED_IN_USER '~/Library/HTTPStorages/com.techsmith.camtasia*' | ||
| trash $LOGGED_IN_USER '~/Library/HTTPStorages/com.techsmith.camtasia*.binarycookies' | ||
| trash $LOGGED_IN_USER '~/Library/Preferences/com.techsmith.camtasia*.plist' | ||
| trash $LOGGED_IN_USER '~/Library/Saved Application State/com.techsmith.camtasia*.savedState' | ||
| trash $LOGGED_IN_USER '~/Library/WebKit/com.techsmith.camtasia*' | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,22 @@ | ||
| { | ||
| "versions": [ | ||
| { | ||
| "version": "2026.0.7", | ||
| "version": "2026.1.0", | ||
| "queries": { | ||
| "exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.techsmith.camtasia';", | ||
| "patched": "SELECT 1 WHERE NOT EXISTS (SELECT 1 FROM apps WHERE bundle_identifier = 'com.techsmith.camtasia' AND version_compare(bundle_short_version, '2026.0.7') < 0);" | ||
| "patched": "SELECT 1 WHERE NOT EXISTS (SELECT 1 FROM apps WHERE bundle_identifier = 'com.techsmith.camtasia' AND version_compare(bundle_short_version, '2026.1.0') < 0);" | ||
| }, | ||
| "installer_url": "https://download.techsmith.com/camtasiamac/releases/2607/Camtasia.dmg", | ||
| "installer_url": "https://download.techsmith.com/camtasiamac/releases/2026.1.0/Camtasia.dmg", | ||
| "install_script_ref": "2fda011f", | ||
| "uninstall_script_ref": "4603b920", | ||
| "sha256": "e5bbf9500bef6d3caac3a58eebf54695784af6bf5c04548dd6320a5c728da74d", | ||
| "uninstall_script_ref": "a83239bb", | ||
| "sha256": "edf947b8689dc9f6209059f05c29ea39f172b0f028b6f5fd9717754d9ceb64d5", | ||
| "default_categories": [ | ||
| "Productivity" | ||
| ] | ||
| } | ||
| ], | ||
| "refs": { | ||
| "2fda011f": "#!/bin/bash\n\n# variables\nAPPDIR=\"/Applications/\"\nTMPDIR=$(dirname \"$(realpath \"$INSTALLER_PATH\")\")\n# functions\n\nquit_and_track_application() {\n local bundle_id=\"$1\"\n local var_name=\"APP_WAS_RUNNING_$(echo \"$bundle_id\" | tr '.-' '__')\"\n local timeout_duration=10\n\n # check if the application is running\n local app_running\n app_running=$(osascript -e \"application id \\\"$bundle_id\\\" is running\" 2>/dev/null)\n if [[ \"$app_running\" != \"true\" ]]; then\n eval \"export $var_name=0\"\n return\n fi\n\n local console_user\n console_user=$(stat -f \"%Su\" /dev/console)\n if [[ -z \"$console_user\" || \"$console_user\" == \"root\" || \"$console_user\" == \"loginwindow\" ]]; then\n echo \"Not logged into a non-root GUI; skipping quitting application ID '$bundle_id'.\"\n eval \"export $var_name=0\"\n return\n fi\n\n # App was running, mark it for relaunch\n eval \"export $var_name=1\"\n echo \"Application '$bundle_id' was running; will relaunch after installation.\"\n\n echo \"Quitting application '$bundle_id'...\"\n\n # try to quit the application within the timeout period\n local quit_success=false\n SECONDS=0\n while (( SECONDS < timeout_duration )); do\n if osascript -e \"tell application id \\\"$bundle_id\\\" to quit\" >/dev/null 2>&1; then\n if ! pgrep -f \"$bundle_id\" >/dev/null 2>&1; then\n echo \"Application '$bundle_id' quit successfully.\"\n quit_success=true\n break\n fi\n fi\n sleep 1\n done\n\n if [[ \"$quit_success\" = false ]]; then\n echo \"Application '$bundle_id' did not quit.\"\n fi\n}\n\n\nrelaunch_application() {\n local bundle_id=\"$1\"\n local var_name=\"APP_WAS_RUNNING_$(echo \"$bundle_id\" | tr '.-' '__')\"\n local was_running\n\n # Check if the app was running before installation\n eval \"was_running=\\$$var_name\"\n if [[ \"$was_running\" != \"1\" ]]; then\n return\n fi\n\n local console_user\n console_user=$(stat -f \"%Su\" /dev/console)\n if [[ -z \"$console_user\" || \"$console_user\" == \"root\" || \"$console_user\" == \"loginwindow\" ]]; then\n echo \"Not logged into a non-root GUI; skipping relaunching application ID '$bundle_id'.\"\n return\n fi\n\n echo \"Relaunching application '$bundle_id'...\"\n\n # Launch the app in the logged-in user's GUI session. Apps launched by root\n # won't register with the user's Dock/GUI, so run 'open' as the console user.\n # Use 'launchctl asuser' to bootstrap into the console user's Mach namespace\n # and GUI session — 'sudo -u' alone doesn't do this, which can cause\n # LSOpenURLsWithRole() failures even when 'open' exits 0.\n local open_status=0\n if [[ $EUID -eq 0 ]]; then\n local console_uid\n console_uid=$(id -u \"$console_user\")\n /bin/launchctl asuser \"$console_uid\" sudo -u \"$console_user\" open -b \"$bundle_id\" >/dev/null 2>&1 || open_status=$?\n else\n open -b \"$bundle_id\" >/dev/null 2>&1 || open_status=$?\n fi\n\n if [[ $open_status -eq 0 ]]; then\n echo \"Application '$bundle_id' relaunched successfully.\"\n else\n echo \"Failed to relaunch application '$bundle_id'.\"\n fi\n}\n\n\n# extract contents\nMOUNT_POINT=$(mktemp -d /tmp/dmg_mount_XXXXXX)\nhdiutil attach -plist -nobrowse -readonly -mountpoint \"$MOUNT_POINT\" \"$INSTALLER_PATH\"\nsudo cp -R \"$MOUNT_POINT\"/* \"$TMPDIR\"\nhdiutil detach \"$MOUNT_POINT\"\n# copy to the applications folder\nquit_and_track_application 'com.techsmith.camtasia'\nif [ -d \"$APPDIR/Camtasia.app\" ]; then\n\tsudo mv \"$APPDIR/Camtasia.app\" \"$TMPDIR/Camtasia.app.bkp\"\nfi\nsudo cp -R \"$TMPDIR/Camtasia.app\" \"$APPDIR\"\nrelaunch_application 'com.techsmith.camtasia'\n", | ||
| "4603b920": "#!/bin/bash\n\n# variables\nAPPDIR=\"/Applications/\"\nLOGGED_IN_USER=$(scutil <<< \"show State:/Users/ConsoleUser\" | awk '/Name :/ { print $3 }')\n# functions\n\ntrash() {\n local logged_in_user=\"$1\"\n local target_file=\"$2\"\n local timestamp=\"$(date +%Y-%m-%d-%s)\"\n local rand=\"$(jot -r 1 0 99999)\"\n\n # replace ~ with /Users/$logged_in_user\n if [[ \"$target_file\" == ~* ]]; then\n target_file=\"/Users/$logged_in_user${target_file:1}\"\n fi\n\n local trash=\"/Users/$logged_in_user/.Trash\"\n local file_name=\"$(basename \"${target_file}\")\"\n\n if [[ -e \"$target_file\" ]]; then\n echo \"removing $target_file.\"\n mv -f \"$target_file\" \"$trash/${file_name}_${timestamp}_${rand}\"\n else\n echo \"$target_file doesn't exist.\"\n fi\n}\n\nsudo rm -rf \"$APPDIR/Camtasia.app\"\ntrash $LOGGED_IN_USER '/Users/Shared/TechSmith/Camtasia'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.techsmith.camtasia26.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/TechSmith/Camtasia*'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.techsmith.camtasia*'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.techsmith.camtasia*'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.techsmith.camtasia*'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.techsmith.camtasia*.binarycookies'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.techsmith.camtasia*.plist'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/com.techsmith.camtasia*.savedState'\ntrash $LOGGED_IN_USER '~/Library/WebKit/com.techsmith.camtasia*'\n" | ||
| "a83239bb": "#!/bin/bash\n\n# variables\nAPPDIR=\"/Applications/\"\nLOGGED_IN_USER=$(scutil <<< \"show State:/Users/ConsoleUser\" | awk '/Name :/ { print $3 }')\n# functions\n\ntrash() {\n local logged_in_user=\"$1\"\n local target_file=\"$2\"\n local timestamp=\"$(date +%Y-%m-%d-%s)\"\n local rand=\"$(jot -r 1 0 99999)\"\n\n # replace ~ with /Users/$logged_in_user\n if [[ \"$target_file\" == ~* ]]; then\n target_file=\"/Users/$logged_in_user${target_file:1}\"\n fi\n\n local trash=\"/Users/$logged_in_user/.Trash\"\n local file_name=\"$(basename \"${target_file}\")\"\n\n if [[ -e \"$target_file\" ]]; then\n echo \"removing $target_file.\"\n mv -f \"$target_file\" \"$trash/${file_name}_${timestamp}_${rand}\"\n else\n echo \"$target_file doesn't exist.\"\n fi\n}\n\nsudo rm -rf \"$APPDIR/Camtasia.app\"\ntrash $LOGGED_IN_USER '/Users/Shared/TechSmith/Camtasia'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.techsmith.camtasia26.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.techsmith.camtasia2026.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/TechSmith/Camtasia*'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.techsmith.camtasia*'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.techsmith.camtasia*'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.techsmith.camtasia*'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.techsmith.camtasia*.binarycookies'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.techsmith.camtasia*.plist'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/com.techsmith.camtasia*.savedState'\ntrash $LOGGED_IN_USER '~/Library/WebKit/com.techsmith.camtasia*'\n" | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: fleetdm/fleet
Length of output: 100
🏁 Script executed:
Repository: fleetdm/fleet
Length of output: 2118
🏁 Script executed:
Repository: fleetdm/fleet
Length of output: 1299
🏁 Script executed:
Repository: fleetdm/fleet
Length of output: 540
🏁 Script executed:
Repository: fleetdm/fleet
Length of output: 280
Quoted wildcard patterns prevent glob expansion, so most user artifacts won't be cleaned.
The
trash()function receives path patterns as quoted strings (e.g.,'~/Library/Caches/com.techsmith.camtasia*'on lines 32–41) and stores them directly in a quoted variabletarget_file="$2"(line 10). This prevents glob expansion. At line 22, the quoted[[ -e "$target_file" ]]check fails because the literal string containing*does not exist as a file, causing the function to always report "doesn't exist" for patterns that should match multiple files.Proposed fix
trash() { local logged_in_user="$1" - local target_file="$2" + local target_pattern="$2" local timestamp="$(date +%Y-%m-%d-%s)" local rand="$(jot -r 1 0 99999)" # replace ~ with /Users/$logged_in_user - if [[ "$target_file" == ~* ]]; then - target_file="/Users/$logged_in_user${target_file:1}" + if [[ "$target_pattern" == ~* ]]; then + target_pattern="/Users/$logged_in_user${target_pattern:1}" fi local trash="/Users/$logged_in_user/.Trash" - local file_name="$(basename "${target_file}")" + shopt -s nullglob + local matches=( $target_pattern ) + shopt -u nullglob - if [[ -e "$target_file" ]]; then - echo "removing $target_file." - mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}" - else - echo "$target_pattern doesn't exist." - fi + if (( ${`#matches`[@]} == 0 )); then + echo "$target_pattern doesn't exist." + return + fi + + for target_file in "${matches[@]}"; do + local file_name + file_name="$(basename "$target_file")" + echo "removing $target_file." + mv -f "$target_file" "$trash/${file_name}_${timestamp}_${rand}" + done }🧰 Tools
🪛 Shellcheck (0.11.0)
[info] 31-31: Double quote to prevent globbing and word splitting.
(SC2086)
[info] 32-32: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 32-32: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 33-33: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 33-33: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 34-34: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 34-34: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 35-35: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 35-35: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 36-36: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 36-36: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 37-37: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 37-37: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 38-38: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 38-38: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 39-39: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 39-39: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 40-40: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 40-40: Tilde does not expand in quotes. Use $HOME.
(SC2088)
[info] 41-41: Double quote to prevent globbing and word splitting.
(SC2086)
[warning] 41-41: Tilde does not expand in quotes. Use $HOME.
(SC2088)
🤖 Prompt for AI Agents