Add custom install script for GitHub Desktop (#39132)
This pull request updates the installation process for the GitHub Desktop application on macOS. The main improvement is switching the extraction method in the install script from `unzip` to `ditto` with the `--noqtn` flag, which prevents the app bundle from being quarantined after installation. This change is reflected in both the input configuration and the generated output files. **Install script improvements:** - The install script for GitHub Desktop (`github-desktop-install.sh`) now uses `ditto -xk --noqtn` instead of `unzip` to extract the application, ensuring the app is not marked as quarantined by macOS after installation. - The script logic and structure have been slightly refactored for clarity, but the core install and relaunch logic remains the same. **Configuration and reference updates:** - The `install_script_path` property was added to the Homebrew input JSON for GitHub Desktop, pointing to the new install script. - The output configuration (`darwin.json`) updates the install script reference to the new version and includes the updated script content. [[1]](diffhunk://#diff-d9d687547de8380c36144e69b184a84cbfa749eae965cab3cb313e2ff88eff20L9-R9) [[2]](diffhunk://#diff-d9d687547de8380c36144e69b184a84cbfa749eae965cab3cb313e2ff88eff20L18-R18) **Related issue:** Resolves #38679
This commit is contained in:
Allen Houchins
@@ -4,5 +4,6 @@
|
||||
"token": "github",
|
||||
"installer_format": "zip",
|
||||
"slug": "github/darwin",
|
||||
"default_categories": ["Developer tools"]
|
||||
"default_categories": ["Developer tools"],
|
||||
"install_script_path": "ee/maintained-apps/inputs/homebrew/scripts/github-desktop-install.sh"
|
||||
}
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
#!/bin/sh
|
||||
|
||||
# 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
|
||||
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
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
# Extract with ditto and --noqtn so extracted files do NOT get quarantine.
|
||||
ditto -xk --noqtn "$INSTALLER_PATH" "$TMPDIR"
|
||||
|
||||
# copy to the applications folder (do not modify the app bundle after extraction)
|
||||
quit_and_track_application 'com.github.GitHubClient'
|
||||
if [ -d "$APPDIR/GitHub Desktop.app" ]; then
|
||||
sudo mv "$APPDIR/GitHub Desktop.app" "$TMPDIR/GitHub Desktop.app.bkp"
|
||||
fi
|
||||
sudo cp -R "$TMPDIR/GitHub Desktop.app" "$APPDIR"
|
||||
|
||||
relaunch_application 'com.github.GitHubClient'
|
||||
|
||||
mkdir -p .
|
||||
/bin/ln -h -f -s -- "$APPDIR/GitHub Desktop.app/Contents/Resources/app/static/github.sh" "github"
|
||||
@@ -6,7 +6,7 @@
|
||||
"exists": "SELECT 1 FROM apps WHERE bundle_identifier = 'com.github.GitHubClient';"
|
||||
},
|
||||
"installer_url": "https://desktop.githubusercontent.com/releases/3.5.4-9dfb8d8d/GitHubDesktop-arm64.zip",
|
||||
"install_script_ref": "40130969",
|
||||
"install_script_ref": "6898fe3b",
|
||||
"uninstall_script_ref": "e8252f2a",
|
||||
"sha256": "34c76f8cbd58771ce7c9e4b7440708502cf9c6921fe099261ec08a413d72de8b",
|
||||
"default_categories": [
|
||||
@@ -15,7 +15,7 @@
|
||||
}
|
||||
],
|
||||
"refs": {
|
||||
"40130969": "#!/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.github.GitHubClient'\nif [ -d \"$APPDIR/GitHub Desktop.app\" ]; then\n\tsudo mv \"$APPDIR/GitHub Desktop.app\" \"$TMPDIR/GitHub Desktop.app.bkp\"\nfi\nsudo cp -R \"$TMPDIR/GitHub Desktop.app\" \"$APPDIR\"\nrelaunch_application 'com.github.GitHubClient'\nmkdir -p .\n/bin/ln -h -f -s -- \"$APPDIR/GitHub Desktop.app/Contents/Resources/app/static/github.sh\" \"github\"\n",
|
||||
"6898fe3b": "#!/bin/sh\n\n# variables\nAPPDIR=\"/Applications/\"\nTMPDIR=$(dirname \"$(realpath $INSTALLER_PATH)\")\n\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\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# Extract with ditto and --noqtn so extracted files do NOT get quarantine.\nditto -xk --noqtn \"$INSTALLER_PATH\" \"$TMPDIR\"\n\n# copy to the applications folder (do not modify the app bundle after extraction)\nquit_and_track_application 'com.github.GitHubClient'\nif [ -d \"$APPDIR/GitHub Desktop.app\" ]; then\n sudo mv \"$APPDIR/GitHub Desktop.app\" \"$TMPDIR/GitHub Desktop.app.bkp\"\nfi\nsudo cp -R \"$TMPDIR/GitHub Desktop.app\" \"$APPDIR\"\n\nrelaunch_application 'com.github.GitHubClient'\n\nmkdir -p .\n/bin/ln -h -f -s -- \"$APPDIR/GitHub Desktop.app/Contents/Resources/app/static/github.sh\" \"github\"\n",
|
||||
"e8252f2a": "#!/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/GitHub Desktop.app\"\nsudo rm -rf 'github'\nsudo rmdir '~/.config/git'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.apple.sharedfilelist/com.apple.LSSharedFileList.ApplicationRecentDocuments/com.github.GitHubClient.sfl*'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.github.GitHubClient'\ntrash $LOGGED_IN_USER '~/Library/Application Support/com.github.GitHubClient.ShipIt'\ntrash $LOGGED_IN_USER '~/Library/Application Support/GitHub Desktop'\ntrash $LOGGED_IN_USER '~/Library/Application Support/ShipIt_stderr.log'\ntrash $LOGGED_IN_USER '~/Library/Application Support/ShipIt_stdout.log'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.github.GitHubClient'\ntrash $LOGGED_IN_USER '~/Library/Caches/com.github.GitHubClient.ShipIt'\ntrash $LOGGED_IN_USER '~/Library/HTTPStorages/com.github.GitHubClient'\ntrash $LOGGED_IN_USER '~/Library/Logs/GitHub Desktop'\ntrash $LOGGED_IN_USER '~/Library/Preferences/ByHost/com.github.GitHubClient.ShipIt.*.plist'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.github.GitHubClient.helper.plist'\ntrash $LOGGED_IN_USER '~/Library/Preferences/com.github.GitHubClient.plist'\ntrash $LOGGED_IN_USER '~/Library/Saved Application State/com.github.GitHubClient.savedState'\n"
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user