iSharkFly-Docs
/
packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't try to determine file or folder with winrm communicator; not all systems will have powershell installed on them

This commit is contained in:
Megan Marsh 2018-07-11 13:30:20 -07:00
parent 8e22803099
commit 36df317b89
1 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
communicator/winrm/communicator.go
View File

@ -122,26 +122,11 @@ func runCommand(shell *winrm.Shell, cmd *winrm.Command, rc *packer.RemoteCmd) {
} }
// Upload implementation of communicator.Communicator interface // Upload implementation of communicator.Communicator interface
func (c *Communicator) Upload(path string, input io.Reader, fi *os.FileInfo) error { func (c *Communicator) Upload(path string, input io.Reader, _ *os.FileInfo) error {
wcp, err := c.newCopyClient() wcp, err := c.newCopyClient()
if err != nil {
return err
}
if err != nil { if err != nil {
return fmt.Errorf("Was unable to create winrm client: %s", err) return fmt.Errorf("Was unable to create winrm client: %s", err)
} }
client, err := c.newWinRMClient()
stdout, _, _, err := client.RunWithString(fmt.Sprintf("powershell -Command \"(Get-Item %s) -is [System.IO.DirectoryInfo]\"", path), "")
if err != nil {
return fmt.Errorf("Couldn't determine whether destination was a folder or file: %s", err)
}
if strings.Contains(stdout, "True") {
// The path exists and is a directory.
// Upload file into the directory instead of overwriting.
path = filepath.Join(path, filepath.Base((*fi).Name()))
}
log.Printf("Uploading file to '%s'", path) log.Printf("Uploading file to '%s'", path)
return wcp.Write(path, input) return wcp.Write(path, input)
} }