From 1777b9c5d1c6169efe1149cf537d39192058872a Mon Sep 17 00:00:00 2001 From: Noah Talerman <47070608+noahtalerman@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:21:19 -0400 Subject: [PATCH] Update macos-install-wine.sh (#17828) - Add note about running the script in user context - Add redirect so that we can change the link later --- orbit/pkg/packaging/windows.go | 2 +- scripts/macos-install-wine.sh | 3 ++- website/config/routes.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/orbit/pkg/packaging/windows.go b/orbit/pkg/packaging/windows.go index 731e57efe..b35a00c5b 100644 --- a/orbit/pkg/packaging/windows.go +++ b/orbit/pkg/packaging/windows.go @@ -222,7 +222,7 @@ func checkWine(wineChecked bool) error { cmd := exec.Command(wix.WineCmd, "--version") if err := cmd.Run(); err != nil { return fmt.Errorf( - "%s failed. Is Wine installed? Creating a fleetd agent for Windows (.msi) requires Wine. To install Wine see the script here: https://github.com/fleetdm/fleet/blob/fleet-v4.44.0/scripts/macos-install-wine.sh %w", + "%s failed. Is Wine installed? Creating a fleetd agent for Windows (.msi) requires Wine. To install Wine see the script here: https://fleetdm.com/install-wine %w", wix.WineCmd, err, ) } diff --git a/scripts/macos-install-wine.sh b/scripts/macos-install-wine.sh index fd5c55532..5a29f352d 100755 --- a/scripts/macos-install-wine.sh +++ b/scripts/macos-install-wine.sh @@ -2,8 +2,9 @@ set -eo pipefail +# Run this script in user context (not root). # Reference: https://wiki.winehq.org/MacOS -# NOTE: Wine can be installed without brew via a distribution such as https://github.com/Gcenx/macOS_Wine_builds/releases/tag/9.0, or by building from source. +# Wine can be installed without brew via a distribution such as https://github.com/Gcenx/macOS_Wine_builds/releases/tag/9.0, or by building from source. # Check if brew is installed if ! command -v brew >/dev/null 2>&1 ; then diff --git a/website/config/routes.js b/website/config/routes.js index 4a69f469a..6a486f1db 100644 --- a/website/config/routes.js +++ b/website/config/routes.js @@ -511,6 +511,7 @@ module.exports.routes = { 'GET /learn-more-about/enrolling-hosts': '/docs/using-fleet/adding-hosts', 'GET /learn-more-about/setup-assistant': '/docs/using-fleet/mdm-macos-setup-experience#macos-setup-assistant', 'GET /learn-more-about/policy-automations': '/docs/using-fleet/automations', + 'GET /install-wine': 'https://github.com/fleetdm/fleet/blob/main/scripts/macos-install-wine.sh', // Sitemap // =============================================================================================================