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

2210 fix windows end of line #2216

Merged
merged 5 commits into from
Jan 27, 2022
Merged

2210 fix windows end of line #2216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9115cbc
Add constants for windows and non-windows systems
leszko Jan 26, 2022
183d692
cli: Update instructions for Windows
leszko Jan 26, 2022
7f895fd
Test Windows in GH Actions
leszko Jan 26, 2022
23ad754
Revert "Test Windows in GH Actions"
leszko Jan 26, 2022
00b3cfc
Update CHANGELOG_PENDING.md
leszko Jan 26, 2022
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
2 changes: 2 additions & 0 deletions CHANGELOG_PENDING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

#### General

- \#2216 Fix Accept Multiline message on Windows (@leszko)

#### Broadcaster

#### Orchestrator
Expand Down
5 changes: 5 additions & 0 deletions build/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// +build !windows

package build

const AcceptMultiline = "Ctrl+D"
5 changes: 5 additions & 0 deletions build/const_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
// +build windows

package build

const AcceptMultiline = "Ctrl+Z"
3 changes: 2 additions & 1 deletion cmd/livepeer_cli/wizard.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"bytes"
"errors"
"fmt"
"github.com/livepeer/go-livepeer/build"
"io/ioutil"
"math/big"
"net/http"
Expand Down Expand Up @@ -44,7 +45,7 @@ func (w *wizard) readString() string {
}

func (w *wizard) readMultilineString() string {
fmt.Printf("(press enter followed by CTRL+D when done) > ")
fmt.Printf("(press enter followed by %s when done) > ", build.AcceptMultiline)

var buf strings.Builder
scanner := bufio.NewScanner(os.Stdin)
Expand Down