From 897e6a5d84f61b84b14b62e5bbd9dd8b1ce5b49a Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 8 Apr 2016 17:19:34 +0200 Subject: [PATCH 1/4] windows: fix login --- pkg/commands/login.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/commands/login.go b/pkg/commands/login.go index d3ea1c42c1..197969c7e4 100644 --- a/pkg/commands/login.go +++ b/pkg/commands/login.go @@ -160,8 +160,8 @@ func connectAPI() (string, string, error) { } connect := api.ScalewayConnect{ - Email: strings.Trim(email, "\n"), - Password: strings.Trim(password, "\n"), + Email: strings.Trim(email, "\r\n"), + Password: strings.Trim(password, "\r\n"), Expires: false, Description: strings.Join([]string{"scw", hostname}, "-"), } From f00823247d4d622071f882c8c5b60522de3aa3c5 Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 8 Apr 2016 17:20:13 +0200 Subject: [PATCH 2/4] windows: hotfix exec command --- pkg/sshcommand/sshcommand.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/sshcommand/sshcommand.go b/pkg/sshcommand/sshcommand.go index 9a467dd5ba..67ddf1e2b4 100644 --- a/pkg/sshcommand/sshcommand.go +++ b/pkg/sshcommand/sshcommand.go @@ -2,6 +2,7 @@ package sshcommand import ( "fmt" + "runtime" "strings" ) @@ -96,10 +97,11 @@ func (c *Command) Slice() []string { escapedCommand = append(escapedCommand, fmt.Sprintf("%q", part)) } } - slice = append(slice, fmt.Sprintf("%q", strings.Join(escapedCommand, " "))) } - + if runtime.GOOS == "windows" { + slice[len(slice)-1] = slice[len(slice)-1] + " " // WTF: Why ? + } return slice } From ff1bcf1b10f81d57e0f6bbb58df01e04acb1024c Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 8 Apr 2016 17:33:32 +0200 Subject: [PATCH 3/4] windows: hotfix exec command --- pkg/sshcommand/sshcommand.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/sshcommand/sshcommand.go b/pkg/sshcommand/sshcommand.go index 67ddf1e2b4..c6b918223f 100644 --- a/pkg/sshcommand/sshcommand.go +++ b/pkg/sshcommand/sshcommand.go @@ -100,7 +100,7 @@ func (c *Command) Slice() []string { slice = append(slice, fmt.Sprintf("%q", strings.Join(escapedCommand, " "))) } if runtime.GOOS == "windows" { - slice[len(slice)-1] = slice[len(slice)-1] + " " // WTF: Why ? + slice[len(slice)-1] = slice[len(slice)-1] + " " // Why ? } return slice } From e57d766e6b37cef967bc7ad898e751375b51796e Mon Sep 17 00:00:00 2001 From: Quentin Perez Date: Fri, 8 Apr 2016 17:33:38 +0200 Subject: [PATCH 4/4] README.md: update --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1a83d35220..21723134e4 100644 --- a/README.md +++ b/README.md @@ -1183,6 +1183,8 @@ $ scw inspect myserver | jq '.[0].public_ip.address' ### master (unreleased) +* Fix sshExecCommand with Windows ([#338](https://github.com/scaleway/scaleway-cli/issues/338)) +* Fix `scw login` with Windows ([#341](https://github.com/scaleway/scaleway-cli/issues/341)) * Add `enable_ipv6` field ([#334](https://github.com/scaleway/scaleway-cli/issues/334)) * `scw _patch` handles ipv6=[true|false] * Add `ScalewayIPV6Definition`