diff --git a/ee/maintained-apps/ingesters/homebrew/scripts.go b/ee/maintained-apps/ingesters/homebrew/scripts.go index c59bd340ce..d0d142fa98 100644 --- a/ee/maintained-apps/ingesters/homebrew/scripts.go +++ b/ee/maintained-apps/ingesters/homebrew/scripts.go @@ -19,16 +19,26 @@ func installScriptForApp(app inputApp, cask *brewCask) (string, error) { sb.Extract(app.InstallerFormat) - var includeQuitFunc bool + // Add quit/relaunch functions if we have App or Pkg artifacts + var needsQuitRelaunch bool + for _, artifact := range cask.Artifacts { + if len(artifact.App) > 0 || len(artifact.Pkg) > 0 { + needsQuitRelaunch = true + break + } + } + + if needsQuitRelaunch { + sb.AddFunction("quit_and_track_application", quitAndTrackApplicationFunc) + sb.AddFunction("relaunch_application", relaunchApplicationFunc) + } + for _, artifact := range cask.Artifacts { switch { case len(artifact.App) > 0: sb.Write("# copy to the applications folder") - sb.Writef("quit_application '%s'", app.UniqueIdentifier) - if cask.Token == "docker" { - sb.Writef("quit_application 'com.electron.dockerdesktop'") - } - includeQuitFunc = true + // Quit the app before installing if it's running, and track state for relaunch + sb.Writef("quit_and_track_application '%s'", app.UniqueIdentifier) for _, appItem := range artifact.App { // Only process string values (skip objects with target, those are handled by custom scripts) if appItem.String == "" { @@ -40,9 +50,13 @@ func installScriptForApp(app inputApp, cask *brewCask) (string, error) { fi`, appPath) sb.Copy(appPath, "$APPDIR") } + // Relaunch the app if it was running before installation + sb.Writef("relaunch_application '%s'", app.UniqueIdentifier) case len(artifact.Pkg) > 0: sb.Write("# install pkg files") + // Quit the app before installing if it's running, and track state for relaunch + sb.Writef("quit_and_track_application '%s'", app.UniqueIdentifier) switch len(artifact.Pkg) { case 1: if err := sb.InstallPkg(artifact.Pkg[0].String); err != nil { @@ -55,6 +69,8 @@ fi`, appPath) default: return "", fmt.Errorf("application %s has unknown directive format for pkg", app.Token) } + // Relaunch the app if it was running before installation + sb.Writef("relaunch_application '%s'", app.UniqueIdentifier) case len(artifact.Binary) > 0: if len(artifact.Binary) == 2 { @@ -69,10 +85,6 @@ fi`, appPath) } } - if includeQuitFunc { - sb.AddFunction("quit_application", quitApplicationFunc) - } - return sb.String(), nil } @@ -556,6 +568,84 @@ const quitApplicationFunc = `quit_application() { } ` +// quitAndTrackApplicationFunc quits a running application and tracks whether it was running +// so it can be relaunched after installation. Sets APP_WAS_RUNNING_ environment variable. +const quitAndTrackApplicationFunc = `quit_and_track_application() { + local bundle_id="$1" + local var_name="APP_WAS_RUNNING_$(echo "$bundle_id" | tr '.-' '__')" + local timeout_duration=10 + + # check if the application is running + if ! osascript -e "application id \"$bundle_id\" is running" 2>/dev/null; then + eval "export $var_name=0" + return + fi + + local console_user + console_user=$(stat -f "%Su" /dev/console) + if [[ $EUID -eq 0 && "$console_user" == "root" ]]; then + echo "Not logged into a non-root GUI; skipping quitting application ID '$bundle_id'." + eval "export $var_name=0" + return + fi + + # App was running, mark it for relaunch + eval "export $var_name=1" + echo "Application '$bundle_id' was running; will relaunch after installation." + + echo "Quitting application '$bundle_id'..." + + # try to quit the application within the timeout period + local quit_success=false + SECONDS=0 + while (( SECONDS < timeout_duration )); do + if osascript -e "tell application id \"$bundle_id\" to quit" >/dev/null 2>&1; then + if ! pgrep -f "$bundle_id" >/dev/null 2>&1; then + echo "Application '$bundle_id' quit successfully." + quit_success=true + break + fi + fi + sleep 1 + done + + if [[ "$quit_success" = false ]]; then + echo "Application '$bundle_id' did not quit." + fi +} +` + +// relaunchApplicationFunc relaunches an application if it was running before installation. +// Checks the APP_WAS_RUNNING_ environment variable set by quitAndTrackApplicationFunc. +const relaunchApplicationFunc = `relaunch_application() { + local bundle_id="$1" + local var_name="APP_WAS_RUNNING_$(echo "$bundle_id" | tr '.-' '__')" + local was_running + + # Check if the app was running before installation + eval "was_running=\$$var_name" + if [[ "$was_running" != "1" ]]; then + return + fi + + local console_user + console_user=$(stat -f "%Su" /dev/console) + if [[ $EUID -eq 0 && "$console_user" == "root" ]]; then + echo "Not logged into a non-root GUI; skipping relaunching application ID '$bundle_id'." + return + fi + + echo "Relaunching application '$bundle_id'..." + + # Try to launch the application + if osascript -e "tell application id \"$bundle_id\" to activate" >/dev/null 2>&1; then + echo "Application '$bundle_id' relaunched successfully." + else + echo "Failed to relaunch application '$bundle_id'." + fi +} +` + const trashFunc = `trash() { local logged_in_user="$1" local target_file="$2" diff --git a/ee/maintained-apps/inputs/homebrew/docker.json b/ee/maintained-apps/inputs/homebrew/docker-desktop.json similarity index 60% rename from ee/maintained-apps/inputs/homebrew/docker.json rename to ee/maintained-apps/inputs/homebrew/docker-desktop.json index 6b10ff7a36..9dec9c50e3 100644 --- a/ee/maintained-apps/inputs/homebrew/docker.json +++ b/ee/maintained-apps/inputs/homebrew/docker-desktop.json @@ -1,7 +1,7 @@ { "name": "Docker Desktop", - "slug": "docker/darwin", - "unique_identifier": "com.docker.docker", + "slug": "docker-desktop/darwin", + "unique_identifier": "com.electron.dockerdesktop", "token": "docker-desktop", "installer_format": "dmg", "default_categories": ["Developer tools"] diff --git a/ee/maintained-apps/outputs/apps.json b/ee/maintained-apps/outputs/apps.json index 20cd27c859..84068beff7 100644 --- a/ee/maintained-apps/outputs/apps.json +++ b/ee/maintained-apps/outputs/apps.json @@ -570,9 +570,9 @@ }, { "name": "Docker Desktop", - "slug": "docker/darwin", + "slug": "docker-desktop/darwin", "platform": "darwin", - "unique_identifier": "com.docker.docker", + "unique_identifier": "com.electron.dockerdesktop", "description": "Docker Desktop provides a seamless environment for building, sharing, and running containerized applications and microservices." }, { diff --git a/ee/maintained-apps/outputs/docker-desktop/darwin.json b/ee/maintained-apps/outputs/docker-desktop/darwin.json new file mode 100644 index 0000000000..621776e2a2 --- /dev/null +++ b/ee/maintained-apps/outputs/docker-desktop/darwin.json @@ -0,0 +1,21 @@ +{ + "versions": [ + { + "version": "4.55.0", + "queries": { + "exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.electron.dockerdesktop';" + }, + "installer_url": "https://desktop.docker.com/mac/main/arm64/213807/Docker.dmg", + "install_script_ref": "2fd921da", + "uninstall_script_ref": "876e899c", + "sha256": "c1a9d2ecccc226ce10d4ec9bcd2defac574e2bbb2c2f42ae6a639e4a57c89ee5", + "default_categories": [ + "Developer tools" + ] + } + ], + "refs": { + "2fd921da": "#!/bin/sh\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 if ! osascript -e \"application id \\\"$bundle_id\\\" is running\" 2>/dev/null; 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 [[ $EUID -eq 0 && \"$console_user\" == \"root\" ]]; 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 [[ $EUID -eq 0 && \"$console_user\" == \"root\" ]]; 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 # Try to launch the application\n if osascript -e \"tell application id \\\"$bundle_id\\\" to activate\" >/dev/null 2>&1; 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.electron.dockerdesktop'\nif [ -d \"$APPDIR/Docker.app\" ]; then\n\tsudo mv \"$APPDIR/Docker.app\" \"$TMPDIR/Docker.app.bkp\"\nfi\nsudo cp -R \"$TMPDIR/Docker.app\" \"$APPDIR\"\nrelaunch_application 'com.electron.dockerdesktop'\nmkdir -p /usr/local/cli-plugins\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/cli-plugins/docker-compose\" \"/usr/local/cli-plugins/docker-compose\"\nmkdir -p /usr/local/bin\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/bin/hub-tool\" \"/usr/local/bin/hub-tool\"\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/bin/kubectl\" \"/usr/local/bin/kubectl.docker\"\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/bin/docker\" \"/usr/local/bin/docker\"\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/bin/docker-credential-desktop\" \"/usr/local/bin/docker-credential-desktop\"\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/bin/docker-credential-ecr-login\" \"/usr/local/bin/docker-credential-ecr-login\"\n/bin/ln -h -f -s -- \"$APPDIR/Docker.app/Contents/Resources/bin/docker-credential-osxkeychain\" \"/usr/local/bin/docker-credential-osxkeychain\"\n", + "876e899c": "#!/bin/sh\n\n# variables\nAPPDIR=\"/Applications/\"\nLOGGED_IN_USER=$(scutil <<< \"show State:/Users/ConsoleUser\" | awk '/Name :/ { print $3 }')\n# functions\n\nquit_application() {\n local bundle_id=\"$1\"\n local timeout_duration=10\n\n # check if the application is running\n if ! osascript -e \"application id \\\"$bundle_id\\\" is running\" 2>/dev/null; then\n return\n fi\n\n local console_user\n console_user=$(stat -f \"%Su\" /dev/console)\n if [[ $EUID -eq 0 && \"$console_user\" == \"root\" ]]; then\n echo \"Not logged into a non-root GUI; skipping quitting application ID '$bundle_id'.\"\n return\n fi\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\nremove_launchctl_service() {\n local service=\"$1\"\n local booleans=(\"true\" \"false\")\n local plist_status\n local paths\n local should_sudo\n\n echo \"Removing launchctl service ${service}\"\n\n for should_sudo in \"${booleans[@]}\"; do\n plist_status=$(launchctl list \"${service}\" 2>/dev/null)\n\n if [[ $plist_status == \\{* ]]; then\n if [[ $should_sudo == \"true\" ]]; then\n sudo launchctl remove \"${service}\"\n else\n launchctl remove \"${service}\"\n fi\n sleep 1\n fi\n\n paths=(\n \"/Library/LaunchAgents/${service}.plist\"\n \"/Library/LaunchDaemons/${service}.plist\"\n )\n\n # if not using sudo, prepend the home directory to the paths\n if [[ $should_sudo == \"false\" ]]; then\n for i in \"${!paths[@]}\"; do\n paths[i]=\"${HOME}${paths[i]}\"\n done\n fi\n\n for path in \"${paths[@]}\"; do\n if [[ -e \"$path\" ]]; then\n if [[ $should_sudo == \"true\" ]]; then\n sudo rm -f -- \"$path\"\n else\n rm -f -- \"$path\"\n fi\n fi\n done\n done\n}\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\nremove_launchctl_service 'com.docker.helper'\nremove_launchctl_service 'com.docker.socket'\nremove_launchctl_service 'com.docker.vmnetd'\nquit_application 'com.docker.docker'\nquit_application 'com.electron.dockerdesktop'\nsudo rm -rf '/Library/PrivilegedHelperTools/com.docker.socket'\nsudo rm -rf '/Library/PrivilegedHelperTools/com.docker.vmnetd'\nsudo rmdir '~/.docker/bin'\nsudo rm -rf \"$APPDIR/Docker.app\"\nsudo rm -rf '/usr/local/cli-plugins/docker-compose'\nsudo rm -rf '/usr/local/bin/hub-tool'\nsudo rm -rf '/usr/local/bin/kubectl.docker'\nsudo rm -rf '/usr/local/bin/docker'\nsudo rm -rf '/usr/local/bin/docker-credential-desktop'\nsudo rm -rf '/usr/local/bin/docker-credential-ecr-login'\nsudo rm -rf '/usr/local/bin/docker-credential-osxkeychain'\nsudo rmdir '~/Library/Caches/com.plausiblelabs.crashreporter.data'\nsudo rmdir '~/Library/Caches/KSCrashReports'\ntrash $LOGGED_IN_USER '/usr/local/bin/docker-compose.backup'\ntrash $LOGGED_IN_USER '/usr/local/bin/docker.backup'\ntrash $LOGGED_IN_USER '~/.docker'\ntrash $LOGGED_IN_USER '~/Library/Application Scripts/com.docker.helper'\ntrash $LOGGED_IN_USER '~/Library/Application Scripts/group.com.docker'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.docker.helper.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.electron.dockerdesktop.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.bugsnag.Bugsnag/com.docker.docker'\ntrash $LOGGED_IN_USER '~/Library/Application Support/Docker Desktop'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.docker.docker'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.plausiblelabs.crashreporter.data/com.docker.docker'\ntrash $LOGGED_IN_USER '~/Library/Caches/KSCrashReports/Docker'\ntrash $LOGGED_IN_USER '~/Library/Containers/com.docker.docker'\ntrash $LOGGED_IN_USER '~/Library/Containers/com.docker.helper'\ntrash $LOGGED_IN_USER '~/Library/Group Containers/group.com.docker'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.docker.docker'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.docker.docker.binarycookies'\ntrash $LOGGED_IN_USER '~/Library/Logs/Docker Desktop'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.docker.docker.plist'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.electron.docker-frontend.plist'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.electron.dockerdesktop.plist'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/com.electron.docker-frontend.savedState'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/com.electron.dockerdesktop.savedState'\n" + } +} diff --git a/frontend/pages/SoftwarePage/components/icons/Docker.tsx b/frontend/pages/SoftwarePage/components/icons/Docker.tsx index 0510385110..411e0c9a20 100644 --- a/frontend/pages/SoftwarePage/components/icons/Docker.tsx +++ b/frontend/pages/SoftwarePage/components/icons/Docker.tsx @@ -1,13 +1,13 @@ -import React from "react"; +import * as React from "react"; import type { SVGProps } from "react"; const Docker = (props: SVGProps) => ( - - - + ); diff --git a/website/assets/images/app-icon-docker-desktop-60x60@2x.png b/website/assets/images/app-icon-docker-desktop-60x60@2x.png new file mode 100644 index 0000000000..730eee9f55 Binary files /dev/null and b/website/assets/images/app-icon-docker-desktop-60x60@2x.png differ