Skip to content

Commit 46b3307

Browse files
committed
Merge pull request #332 from QuentinPerez/fix-321
_userdata: handle ~
2 parents e048f2c + c549fc7 commit 46b3307

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -1189,6 +1189,7 @@ View full [commits list](https://github.com/scaleway/scaleway-cli/compare/v1.9.0
11891189

11901190
### v1.9.0 (2016-04-01)
11911191

1192+
* `scw _userdata` handles `@~/path/to/file` ([#321](https://github.com/scaleway/scaleway-cli/issues/321))
11921193
* Fix bug when using SCW_COMMERCIAL_TYPE variable
11931194
* Switch to VC1S
11941195

pkg/cli/x_userdata.go

+8
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import (
1010
"strings"
1111

1212
"github.com/scaleway/scaleway-cli/pkg/api"
13+
"github.com/scaleway/scaleway-cli/pkg/config"
1314
"github.com/scaleway/scaleway-cli/pkg/scwversion"
1415
)
1516

@@ -90,6 +91,13 @@ func runUserdata(cmd *Command, args []string) error {
9091
var data []byte
9192
// Set userdata
9293
if value[0] == '@' {
94+
if len(value) > 1 && value[1] == '~' {
95+
home, err := config.GetHomeDir()
96+
if err != nil {
97+
return err
98+
}
99+
value = "@" + home + value[2:]
100+
}
93101
data, err = ioutil.ReadFile(value[1:])
94102
if err != nil {
95103
return err

0 commit comments

Comments
 (0)