diff --git a/ee/maintained-apps/inputs/homebrew/marvel.json b/ee/maintained-apps/inputs/homebrew/marvel.json new file mode 100644 index 0000000000..3bb330e8c3 --- /dev/null +++ b/ee/maintained-apps/inputs/homebrew/marvel.json @@ -0,0 +1,8 @@ +{ + "name": "Marvel", + "slug": "marvel/darwin", + "unique_identifier": "com.marvelprototyping.marvelmacos", + "token": "marvel", + "installer_format": "zip", + "default_categories": ["Productivity"] +} diff --git a/ee/maintained-apps/outputs/apps.json b/ee/maintained-apps/outputs/apps.json index aacead860f..baa7915694 100644 --- a/ee/maintained-apps/outputs/apps.json +++ b/ee/maintained-apps/outputs/apps.json @@ -1037,6 +1037,13 @@ "unique_identifier": "org.p0deje.Maccy", "description": "Maccy is a clipboard manager." }, + { + "name": "Marvel", + "slug": "marvel/darwin", + "platform": "darwin", + "unique_identifier": "com.marvelprototyping.marvelmacos", + "description": "Marvel is a design and prototyping platform for creating interactive app and web mockups." + }, { "name": "Mattermost", "slug": "mattermost/darwin", diff --git a/ee/maintained-apps/outputs/marvel/darwin.json b/ee/maintained-apps/outputs/marvel/darwin.json new file mode 100644 index 0000000000..7371be3879 --- /dev/null +++ b/ee/maintained-apps/outputs/marvel/darwin.json @@ -0,0 +1,21 @@ +{ + "versions": [ + { + "version": "11.5", + "queries": { + "exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.marvelprototyping.marvelmacos';" + }, + "installer_url": "https://storage.googleapis.com/sketch-plugin/11.5/Marvel.zip", + "install_script_ref": "1eddbb9e", + "uninstall_script_ref": "ff5ef758", + "sha256": "fd6a3bb8a24ce9f4a44f6b3129ccdf37c532ba95e00ae6537f6d9a6699654911", + "default_categories": [ + "Productivity" + ] + } + ], + "refs": { + "1eddbb9e": "#!/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\nunzip \"$INSTALLER_PATH\" -d \"$TMPDIR\"\n# copy to the applications folder\nquit_and_track_application 'com.marvelprototyping.marvelmacos'\nif [ -d \"$APPDIR/Marvel.app\" ]; then\n\tsudo mv \"$APPDIR/Marvel.app\" \"$TMPDIR/Marvel.app.bkp\"\nfi\nsudo cp -R \"$TMPDIR/Marvel.app\" \"$APPDIR\"\nrelaunch_application 'com.marvelprototyping.marvelmacos'\n", + "ff5ef758": "#!/bin/sh\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/Marvel.app\"\ntrash $LOGGED_IN_USER '~/Library/Caches/com.marvelprototyping.marvelmacos'\n" + } +} diff --git a/frontend/pages/SoftwarePage/components/icons/Marvel.tsx b/frontend/pages/SoftwarePage/components/icons/Marvel.tsx new file mode 100644 index 0000000000..7c76ee0607 --- /dev/null +++ b/frontend/pages/SoftwarePage/components/icons/Marvel.tsx @@ -0,0 +1,14 @@ +import * as React from "react"; + +import type { SVGProps } from "react"; + +const Marvel = (props: SVGProps) => ( + + + +); +export default Marvel; diff --git a/frontend/pages/SoftwarePage/components/icons/index.ts b/frontend/pages/SoftwarePage/components/icons/index.ts index dc9b79b4a9..b59776dc75 100644 --- a/frontend/pages/SoftwarePage/components/icons/index.ts +++ b/frontend/pages/SoftwarePage/components/icons/index.ts @@ -15,6 +15,7 @@ import Iina from "./Iina"; import Kitty from "./Kitty"; import Krita from "./Krita"; import LastPass from "./LastPass"; +import Marvel from "./Marvel"; import Nextcloud from "./Nextcloud"; import Notepad from "./Notepad++"; import OktaVerify from "./OktaVerify"; @@ -319,6 +320,7 @@ export const SOFTWARE_NAME_TO_ICON_MAP = { kitty: Kitty, krita: Krita, lastpass: LastPass, + marvel: Marvel, "microsoft.companyportal": IntuneCompanyPortal, coteditor: CotEditor, cursor: Cursor, diff --git a/website/assets/images/app-icon-marvel-60x60@2x.png b/website/assets/images/app-icon-marvel-60x60@2x.png new file mode 100644 index 0000000000..fce8864b0b Binary files /dev/null and b/website/assets/images/app-icon-marvel-60x60@2x.png differ