empayre/fleet
14
0
Fork 0
mirror of https://github.com/empayre/fleet.git synced 2024-11-06 00:45:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update macos-install-wine.sh (#17828)

Browse Source 
- Add note about running the script in user context
- Add redirect so that we can change the link later
This commit is contained in:
Noah Talerman 2024-03-27 11:21:19 -04:00 committed by GitHub
parent 96d67af9d8
commit 1777b9c5d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
orbit/pkg/packaging/windows.go
View File

@ -222,7 +222,7 @@ func checkWine(wineChecked bool) error {
cmd := exec.Command(wix.WineCmd, "--version") cmd := exec.Command(wix.WineCmd, "--version")
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
return fmt.Errorf( 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, wix.WineCmd, err,
) )
} }

3
scripts/macos-install-wine.sh
View File

@ -2,8 +2,9 @@
set -eo pipefail set -eo pipefail
# Run this script in user context (not root).
# Reference: https://wiki.winehq.org/MacOS # 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 # Check if brew is installed
if ! command -v brew >/dev/null 2>&1 ; then if ! command -v brew >/dev/null 2>&1 ; then

1
website/config/routes.js vendored
View File

@ -511,6 +511,7 @@ module.exports.routes = {
'GET /learn-more-about/enrolling-hosts': '/docs/using-fleet/adding-hosts', '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/setup-assistant': '/docs/using-fleet/mdm-macos-setup-experience#macos-setup-assistant',
'GET /learn-more-about/policy-automations': '/docs/using-fleet/automations', '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 // Sitemap
// ============================================================================================================= // =============================================================================================================