mirror of
https://github.com/fleetdm/fleet
synced 2026-05-02 02:47:30 +00:00
46a740bb21
The install script now copies the p4vc command line binary to /usr/local/bin and sets appropriate permissions. The uninstall script removes p4vc from /usr/local/bin. Updated darwin.json to reference the new script versions. <!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves # # Checklist for submitter If some of the following don't apply, delete the relevant line. - [ ] Changes file added for user-visible changes in `changes/`, `orbit/changes/` or `ee/fleetd-chrome/changes`. See [Changes files](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/guides/committing-changes.md#changes-files) for more information. - [ ] Input data is properly validated, `SELECT *` is avoided, SQL injection is prevented (using placeholders for values in statements) - [ ] If paths of existing endpoints are modified without backwards compatibility, checked the frontend/CLI for any necessary changes ## Testing - [ ] Added/updated automated tests - [ ] Where appropriate, [automated tests simulate multiple hosts and test for host isolation](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/reference/patterns-backend.md#unit-testing) (updates to one hosts's records do not affect another) - [ ] QA'd all new/changed functionality manually For unreleased bug fixes in a release candidate, one of: - [ ] Confirmed that the fix is not expected to adversely impact load test results - [ ] Alerted the release DRI if additional load testing is needed ## Database migrations - [ ] Checked schema for all modified table for columns that will auto-update timestamps during migration. - [ ] Confirmed that updating the timestamps is acceptable, and will not cause unwanted side effects. - [ ] Ensured the correct collation is explicitly set for character columns (`COLLATE utf8mb4_unicode_ci`). ## New Fleet configuration settings - [ ] Setting(s) is/are explicitly excluded from GitOps If you didn't check the box above, follow this checklist for GitOps-enabled settings: - [ ] Verified that the setting is exported via `fleetctl generate-gitops` - [ ] Verified the setting is documented in a separate PR to [the GitOps documentation](https://github.com/fleetdm/fleet/blob/main/docs/Configuration/yaml-files.md#L485) - [ ] Verified that the setting is cleared on the server if it is not supplied in a YAML file (or that it is documented as being optional) - [ ] Verified that any relevant UI is disabled when GitOps mode is enabled ## fleetd/orbit/Fleet Desktop - [ ] Verified compatibility with the latest released version of Fleet (see [Must rule](https://github.com/fleetdm/fleet/blob/main/docs/Contributing/workflows/fleetd-development-and-release-strategy.md)) - [ ] If the change applies to only one platform, confirmed that `runtime.GOOS` is used as needed to isolate changes - [ ] Verified that fleetd runs on macOS, Linux and Windows - [ ] Verified auto-update works from the released version of component to the new version (see [tools/tuf/test](../tools/tuf/test/README.md))
46 lines
1.6 KiB
Bash
46 lines
1.6 KiB
Bash
#!/bin/sh
|
|
|
|
quit_application() {
|
|
local bundle_id="$1"
|
|
local timeout_duration=10
|
|
if ! osascript -e "application id \"$bundle_id\" is running" >/dev/null 2>&1; then return; fi
|
|
local console_user; console_user=$(stat -f "%Su" /dev/console)
|
|
if [[ $EUID -eq 0 && "$console_user" == "root" ]]; then echo "Skipping quit for '$bundle_id'."; return; fi
|
|
echo "Quitting '$bundle_id'..."
|
|
SECONDS=0
|
|
while (( SECONDS < timeout_duration )); do
|
|
osascript -e "tell application id \"$bundle_id\" to quit" >/dev/null 2>&1 || true
|
|
if ! pgrep -f "$bundle_id" >/dev/null 2>&1; then echo "'$bundle_id' quit successfully."; return; fi
|
|
sleep 1
|
|
done
|
|
echo "'$bundle_id' did not quit."
|
|
}
|
|
|
|
[[ -n "$INSTALLER_PATH" && -f "$INSTALLER_PATH" ]] || { echo "missing installer"; exit 1; }
|
|
|
|
APPDIR="/Applications"
|
|
|
|
quit_application "com.perforce.p4v"
|
|
quit_application "com.perforce.p4merge"
|
|
quit_application "com.perforce.p4admin"
|
|
|
|
MOUNT_POINT="$(hdiutil attach -nobrowse -readonly "$INSTALLER_PATH" | awk '/\/Volumes\//{print $3; exit}')"
|
|
[[ -n "$MOUNT_POINT" ]] || { echo "failed to mount dmg"; exit 1; }
|
|
|
|
for app in p4v.app p4merge.app p4admin.app; do
|
|
if [[ -d "$MOUNT_POINT/$app" ]]; then
|
|
rm -rf "$APPDIR/$app" >/dev/null 2>&1 || true
|
|
ditto "$MOUNT_POINT/$app" "$APPDIR/$app" >/dev/null 2>&1
|
|
fi
|
|
done
|
|
|
|
# Install p4vc command line binary to /usr/local/bin
|
|
if [[ -f "$MOUNT_POINT/p4vc" ]]; then
|
|
cp "$MOUNT_POINT/p4vc" /usr/local/bin/p4vc
|
|
chmod +x /usr/local/bin/p4vc
|
|
chown root:wheel /usr/local/bin/p4vc
|
|
fi
|
|
|
|
hdiutil detach "$MOUNT_POINT" >/dev/null 2>&1 || true
|
|
|
|
echo "p4v installed"
|