Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix runDev when running on windows #33

Merged
merged 1 commit into from
Aug 26, 2020
Merged

Fix runDev when running on windows #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions cmd/xcaddy/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,7 @@ func runBuild(ctx context.Context, args []string) error {

// ensure an output file is always specified
if output == "" {
if runtime.GOOS == "windows" {
output = "caddy.exe"
} else {
output = "caddy"
}
output = getCaddyOutputFile()
}

// perform the build
Expand Down Expand Up @@ -141,8 +137,15 @@ func runBuild(ctx context.Context, args []string) error {
return nil
}

func getCaddyOutputFile() string {
if runtime.GOOS == "windows" {
return "caddy.exe"
}
return "caddy"
}

func runDev(ctx context.Context, args []string) error {
const binOutput = "./caddy"
binOutput := getCaddyOutputFile()

// get current/main module name
cmd := exec.Command("go", "list", "-m")
Expand Down