diff --git a/ee/maintained-apps/ingesters/homebrew/external_refs/main.go b/ee/maintained-apps/ingesters/homebrew/external_refs/main.go index ca93b7b465..607ea8bc53 100644 --- a/ee/maintained-apps/ingesters/homebrew/external_refs/main.go +++ b/ee/maintained-apps/ingesters/homebrew/external_refs/main.go @@ -40,6 +40,7 @@ var Funcs = map[string][]func(*maintained_apps.FMAManifestApp) (*maintained_apps "lens/darwin": {LensVersionTransformer}, "grammarly-desktop/darwin": {GrammarlyDesktopVersionShortener}, "anka-virtualization/darwin": {AnkaVersionShortener}, + "pd/darwin": {PdVersionTransformer}, } func ChromePKGInstaller(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) { diff --git a/ee/maintained-apps/ingesters/homebrew/external_refs/version_shortener.go b/ee/maintained-apps/ingesters/homebrew/external_refs/version_shortener.go index efb1c5ded1..62378268d6 100644 --- a/ee/maintained-apps/ingesters/homebrew/external_refs/version_shortener.go +++ b/ee/maintained-apps/ingesters/homebrew/external_refs/version_shortener.go @@ -74,3 +74,15 @@ func LensVersionTransformer(app *maintained_apps.FMAManifestApp) (*maintained_ap app.Version += "-latest" return app, nil } + +// PdVersionTransformer converts Homebrew's Pd version scheme (e.g. "0.56-3") to +// the dotted form macOS reports as bundle_short_version (e.g. "0.56.3"). +// Without this, osquery's version_compare treats "0.56-3" and "0.56.3" as +// different versions and patch policy detection breaks. +func PdVersionTransformer(app *maintained_apps.FMAManifestApp) (*maintained_apps.FMAManifestApp, error) { + if app.Version == "" { + return app, errors.New("empty version for Pd") + } + app.Version = strings.ReplaceAll(app.Version, "-", ".") + return app, nil +} diff --git a/ee/maintained-apps/inputs/homebrew/pd.json b/ee/maintained-apps/inputs/homebrew/pd.json new file mode 100644 index 0000000000..001b7adf19 --- /dev/null +++ b/ee/maintained-apps/inputs/homebrew/pd.json @@ -0,0 +1,9 @@ +{ + "name": "Pd", + "slug": "pd/darwin", + "unique_identifier": "org.puredata.pd.pd-gui", + "token": "pd", + "installer_format": "zip", + "default_categories": ["Developer tools"], + "install_script_path": "ee/maintained-apps/inputs/homebrew/scripts/pd-install.sh" +} diff --git a/ee/maintained-apps/inputs/homebrew/scripts/pd-install.sh b/ee/maintained-apps/inputs/homebrew/scripts/pd-install.sh new file mode 100644 index 0000000000..1ae00658ca --- /dev/null +++ b/ee/maintained-apps/inputs/homebrew/scripts/pd-install.sh @@ -0,0 +1,125 @@ +#!/bin/bash + +# variables +APPDIR="/Applications/" +TMPDIR=$(dirname "$(realpath "$INSTALLER_PATH")") +# functions + +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 + local app_running + app_running=$(osascript -e "application id \"$bundle_id\" is running" 2>/dev/null) + if [[ "$app_running" != "true" ]]; then + eval "export $var_name=0" + return + fi + + local console_user + console_user=$(stat -f "%Su" /dev/console) + if [[ -z "$console_user" || "$console_user" == "root" || "$console_user" == "loginwindow" ]]; 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 +} + + +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 [[ -z "$console_user" || "$console_user" == "root" || "$console_user" == "loginwindow" ]]; then + echo "Not logged into a non-root GUI; skipping relaunching application ID '$bundle_id'." + return + fi + + echo "Relaunching application '$bundle_id'..." + + # Launch the app in the logged-in user's GUI session. Apps launched by root + # won't register with the user's Dock/GUI, so run 'open' as the console user. + # Use 'launchctl asuser' to bootstrap into the console user's Mach namespace + # and GUI session — 'sudo -u' alone doesn't do this, which can cause + # LSOpenURLsWithRole() failures even when 'open' exits 0. + local open_status=0 + if [[ $EUID -eq 0 ]]; then + local console_uid + console_uid=$(id -u "$console_user") + /bin/launchctl asuser "$console_uid" sudo -u "$console_user" open -b "$bundle_id" >/dev/null 2>&1 || open_status=$? + else + open -b "$bundle_id" >/dev/null 2>&1 || open_status=$? + fi + + if [[ $open_status -eq 0 ]]; then + echo "Application '$bundle_id' relaunched successfully." + else + echo "Failed to relaunch application '$bundle_id'." + fi +} + + +# extract contents +# Pd's download is a .zip that contains a .dmg, which in turn contains the .app. +# The app folder name carries the version (e.g. "Pd-0.56-3.app"), so unzip +# first, then mount the embedded DMG and copy whichever .app it contains. This +# keeps the script version-agnostic across Homebrew bumps. +EXTRACT_DIR=$(mktemp -d /tmp/pd_extract_XXXXXX) +unzip -q "$INSTALLER_PATH" -d "$EXTRACT_DIR" +DMG_PATH=$(find "$EXTRACT_DIR" -maxdepth 2 -name "*.dmg" | head -1) +if [ -z "$DMG_PATH" ]; then + echo "No DMG found inside the Pd archive" >&2 + exit 1 +fi +MOUNT_POINT=$(mktemp -d /tmp/dmg_mount_XXXXXX) +yes | hdiutil attach -plist -nobrowse -readonly -mountpoint "$MOUNT_POINT" "$DMG_PATH" || exit 1 +APP_BUNDLE=$(find "$MOUNT_POINT" -maxdepth 1 -name "*.app" | head -1) +if [ -z "$APP_BUNDLE" ]; then + echo "No .app found inside the Pd DMG" >&2 + hdiutil detach "$MOUNT_POINT" || true + exit 1 +fi +APP_NAME=$(basename "$APP_BUNDLE") +# copy to the applications folder +quit_and_track_application 'org.puredata.pd.pd-gui' +if [ -d "$APPDIR/$APP_NAME" ]; then + sudo mv "$APPDIR/$APP_NAME" "$TMPDIR/$APP_NAME.bkp" +fi +sudo cp -R "$APP_BUNDLE" "$APPDIR" +hdiutil detach "$MOUNT_POINT" || true +relaunch_application 'org.puredata.pd.pd-gui' diff --git a/ee/maintained-apps/outputs/apps.json b/ee/maintained-apps/outputs/apps.json index a89796c49a..4280260b7c 100644 --- a/ee/maintained-apps/outputs/apps.json +++ b/ee/maintained-apps/outputs/apps.json @@ -2157,6 +2157,13 @@ "unique_identifier": "com.parallels.desktop.console", "description": "Parallels Desktop is virtualization software." }, + { + "name": "Pd", + "slug": "pd/darwin", + "platform": "darwin", + "unique_identifier": "org.puredata.pd.pd-gui", + "description": "Pd (Pure Data) is a visual programming language for creating interactive computer music and multimedia works." + }, { "name": "pgAdmin 4", "slug": "pgadmin4/darwin", diff --git a/ee/maintained-apps/outputs/pd/darwin.json b/ee/maintained-apps/outputs/pd/darwin.json new file mode 100644 index 0000000000..f0f71f3f35 --- /dev/null +++ b/ee/maintained-apps/outputs/pd/darwin.json @@ -0,0 +1,22 @@ +{ + "versions": [ + { + "version": "0.56.3", + "queries": { + "exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'org.puredata.pd.pd-gui';", + "patched": "SELECT 1 WHERE NOT EXISTS (SELECT 1 FROM apps WHERE bundle_identifier = 'org.puredata.pd.pd-gui' AND version_compare(bundle_short_version, '0.56.3') < 0);" + }, + "installer_url": "https://msp.ucsd.edu/Software/pd-0.56-3.macos.zip", + "install_script_ref": "8a005b0c", + "uninstall_script_ref": "2eac86b0", + "sha256": "9aef99aca0bbc2de8796e3944d234e9f1a64363ff30ad4047641daa7864c743f", + "default_categories": [ + "Developer tools" + ] + } + ], + "refs": { + "2eac86b0": "#!/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\n # If the target contains glob characters, expand it and move each match.\n if [[ \"$target_file\" == *[*?[]* ]]; then\n local file file_name\n local matched=false\n local i=0\n # compgen -G expands the (quoted) pattern itself, so paths containing\n # spaces glob correctly; reading line by line keeps each match intact.\n while IFS= read -r file; do\n [[ -n \"$file\" ]] || continue\n [[ -e \"$file\" || -L \"$file\" ]] || continue\n matched=true\n i=$((i + 1))\n file_name=\"$(basename \"$file\")\"\n echo \"removing $file.\"\n # The per-match counter keeps matches that share a basename from\n # overwriting each other in the trash.\n mv -f \"$file\" \"$trash/${file_name}_${timestamp}_${rand}_${i}\"\n done < <(compgen -G \"$target_file\" 2>/dev/null)\n if [[ \"$matched\" == false ]]; then\n echo \"$target_file doesn't exist.\"\n fi\n return\n fi\n\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/Pd-0.56-3.app\"\ntrash $LOGGED_IN_USER '~/Library/Preferences/org.puredata.pd.pd-gui.plist'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/org.puredata.pd.pd-gui.savedState'\n", + "8a005b0c": "#!/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\n# Pd's download is a .zip that contains a .dmg, which in turn contains the .app.\n# The app folder name carries the version (e.g. \"Pd-0.56-3.app\"), so unzip\n# first, then mount the embedded DMG and copy whichever .app it contains. This\n# keeps the script version-agnostic across Homebrew bumps.\nEXTRACT_DIR=$(mktemp -d /tmp/pd_extract_XXXXXX)\nunzip -q \"$INSTALLER_PATH\" -d \"$EXTRACT_DIR\"\nDMG_PATH=$(find \"$EXTRACT_DIR\" -maxdepth 2 -name \"*.dmg\" | head -1)\nif [ -z \"$DMG_PATH\" ]; then\n echo \"No DMG found inside the Pd archive\" >&2\n exit 1\nfi\nMOUNT_POINT=$(mktemp -d /tmp/dmg_mount_XXXXXX)\nyes | hdiutil attach -plist -nobrowse -readonly -mountpoint \"$MOUNT_POINT\" \"$DMG_PATH\" || exit 1\nAPP_BUNDLE=$(find \"$MOUNT_POINT\" -maxdepth 1 -name \"*.app\" | head -1)\nif [ -z \"$APP_BUNDLE\" ]; then\n echo \"No .app found inside the Pd DMG\" >&2\n hdiutil detach \"$MOUNT_POINT\" || true\n exit 1\nfi\nAPP_NAME=$(basename \"$APP_BUNDLE\")\n# copy to the applications folder\nquit_and_track_application 'org.puredata.pd.pd-gui'\nif [ -d \"$APPDIR/$APP_NAME\" ]; then\n\tsudo mv \"$APPDIR/$APP_NAME\" \"$TMPDIR/$APP_NAME.bkp\"\nfi\nsudo cp -R \"$APP_BUNDLE\" \"$APPDIR\"\nhdiutil detach \"$MOUNT_POINT\" || true\nrelaunch_application 'org.puredata.pd.pd-gui'\n" + } +} diff --git a/frontend/pages/SoftwarePage/components/icons/Pd.tsx b/frontend/pages/SoftwarePage/components/icons/Pd.tsx new file mode 100644 index 0000000000..63ef515c20 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/Pd.tsx @@ -0,0 +1,14 @@ +import * as React from "react"; + +import type { SVGProps } from "react"; + +const Pd = (props: SVGProps) => ( + + + +); +export default Pd; diff --git a/frontend/pages/SoftwarePage/components/icons/index.ts b/frontend/pages/SoftwarePage/components/icons/index.ts index 54f0b4b651..25284d7b24 100644 --- a/frontend/pages/SoftwarePage/components/icons/index.ts +++ b/frontend/pages/SoftwarePage/components/icons/index.ts @@ -65,6 +65,7 @@ import Notepad from "./Notepad++"; import OktaVerify from "./OktaVerify"; import Ollama from "./Ollama"; import OpenvpnConnect from "./OpenvpnConnect"; +import Pd from "./Pd"; import PlantronicsHub from "./PlantronicsHub"; import Postgresql15 from "./Postgresql15"; import Postgresql16 from "./Postgresql16"; @@ -544,6 +545,7 @@ export const SOFTWARE_NAME_TO_ICON_MAP = { package: Package, "parallels desktop": ParallelsDesktop, p4v: P4V, + pd: Pd, "pgadmin 4": PgAdmin4, pgadmin4: PgAdmin4, phpstorm: PhpStorm, diff --git a/website/assets/images/app-icon-pd-60x60@2x.png b/website/assets/images/app-icon-pd-60x60@2x.png new file mode 100644 index 0000000000..1a1539bf5c Binary files /dev/null and b/website/assets/images/app-icon-pd-60x60@2x.png differ