-
Notifications
You must be signed in to change notification settings - Fork 6
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add initial support and docs for Windows (#132)
- Add initial support for Windows - Update docs - Fix issue with openvpn 2.6 data-ciphers
- Loading branch information
1 parent
885f73d
commit 3e819c5
Showing
7 changed files
with
45 additions
and
65 deletions.
There are no files selected for viewing
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ builds: | |
| goos: | ||
| - linux | ||
| - darwin | ||
| - windows | ||
| goarch: | ||
| - amd64 | ||
| - arm | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,47 @@ | ||
| package exec | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "bufio" | ||
| "os" | ||
| "os/exec" | ||
| "strings" | ||
|
|
||
| "github.com/juju/errors" | ||
| "github.com/rs/zerolog/log" | ||
| ) | ||
|
|
||
| // Run executes a command in workDir and returns stdout and error. | ||
| // The spawned process will exit upon termination of this application | ||
| // to ensure a clean exit | ||
| func Run(path string, workDir string, args ...string) (string, error) { | ||
| func Run(path string, workDir string, args ...string) error { | ||
| _, err := exec.LookPath(path) | ||
| if err != nil { | ||
| log.Error().Msgf("%s is required, please install it", path) | ||
| os.Exit(1) | ||
| } | ||
| cmd := exec.Command(path, args...) | ||
| cmd.Dir = workDir | ||
| stdout := &bytes.Buffer{} | ||
| stderr := &bytes.Buffer{} | ||
| cmd.Stdout = stdout | ||
| cmd.Stderr = stderr | ||
| log.Debug().Msgf("Executing " + strings.Join(cmd.Args, " ")) | ||
| err = cmd.Run() | ||
| output := strings.TrimSpace(stdout.String()) | ||
| errOut := strings.TrimSpace(stderr.String()) | ||
| if output != "" { | ||
| log.Debug().Msgf(output) | ||
| stdout, err := cmd.StdoutPipe() | ||
| if err != nil { | ||
| log.Fatal().Msgf("Failed to get stdout pipe: %v", err) | ||
| } | ||
| if errOut != "" { | ||
| log.Debug().Msgf(errOut) | ||
| if err := cmd.Start(); err != nil { | ||
| log.Fatal().Msgf("Failed to start command: %v", err) | ||
| } | ||
| if _, ok := err.(*exec.ExitError); !ok { | ||
| return output, errors.Trace(err) | ||
|
|
||
| scanner := bufio.NewScanner(stdout) | ||
|
|
||
| for scanner.Scan() { | ||
| log.Debug().Msg(scanner.Text()) | ||
| } | ||
| if err != nil { | ||
| return output, errors.Annotatef(err, path, cmd.Args, errOut) | ||
|
|
||
| if err := scanner.Err(); err != nil { | ||
| log.Fatal().Msgf("Error reading stdout: %v", err) | ||
| } | ||
|
|
||
| if err := cmd.Wait(); err != nil { | ||
| log.Fatal().Msgf("Command finished with error: %v", err) | ||
| return err | ||
| } | ||
| return output, nil | ||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters