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

Move code for --local-wix-dir into ee directory (#14104)

Browse Source
This commit is contained in:
Jacob Shandling 2023-09-25 10:38:03 -07:00 committed by GitHub
parent 56d4380ba6
commit 1993c02b3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/fleetctl/package.go
View File

@ -11,6 +11,7 @@ import (
"strings" "strings"
"time" "time"
eefleetctl "github.com/fleetdm/fleet/v4/ee/fleetctl"
"github.com/fleetdm/fleet/v4/orbit/pkg/packaging" "github.com/fleetdm/fleet/v4/orbit/pkg/packaging"
"github.com/rs/zerolog" "github.com/rs/zerolog"
zlog "github.com/rs/zerolog/log" zlog "github.com/rs/zerolog/log"
@ -182,12 +183,7 @@ func packageCommand() *cli.Command {
EnvVars: []string{"FLEETCTL_NATIVE_TOOLING"}, EnvVars: []string{"FLEETCTL_NATIVE_TOOLING"},
Destination: &opt.NativeTooling, Destination: &opt.NativeTooling,
}, },
&cli.StringFlag{ eefleetctl.LocalWixDirFlag(&opt.LocalWixDir),
Name: "local-wix-dir",
Usage: "Use local install of WiX instead of Docker Hub (only available on Windows w/ WiX v3)",
EnvVars: []string{"FLEETCTL_LOCAL_WIX_DIR"},
Destination: &opt.LocalWixDir,
},
&cli.StringFlag{ &cli.StringFlag{
Name: "macos-devid-pem-content", Name: "macos-devid-pem-content",
Usage: "Dev ID certificate keypair content in PEM format", Usage: "Dev ID certificate keypair content in PEM format",

11
ee/fleetctl/local_wix.go Normal file
View File

@ -0,0 +1,11 @@
package eefleetctl
import "github.com/urfave/cli/v2"
func LocalWixDirFlag(dest *string) *cli.StringFlag {
return &cli.StringFlag{
Name: "local-wix-dir",
Usage: "Use local install of WiX instead of Docker Hub (only available on Windows w/ WiX v3). This functionality is licensed under the Fleet EE License. Usage requires a current Fleet EE subscription.",
Destination: dest,
}
}