From 60933fbee54ac3a5e179755baa4152c361fca2e3 Mon Sep 17 00:00:00 2001 From: Nico Verzijp Date: Thu, 5 Jan 2023 15:32:24 +0100 Subject: [PATCH 1/2] fix post-processor for windows --- .gitignore | 3 ++- post-processor/vagrant/libvirt.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 991c9d04..06c2a081 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ main dist/* -packer-plugin-vagrant \ No newline at end of file +packer-plugin-vagrant +packer-plugin-vagrant.exe \ No newline at end of file diff --git a/post-processor/vagrant/libvirt.go b/post-processor/vagrant/libvirt.go index 4a61bdf3..0edcf686 100644 --- a/post-processor/vagrant/libvirt.go +++ b/post-processor/vagrant/libvirt.go @@ -68,7 +68,7 @@ func (p *LibVirtProvider) Process(ui packersdk.Ui, artifact packersdk.Artifact, // Copy the disk image into the temporary directory (as box.img) for _, path := range artifact.Files() { - if strings.HasSuffix(path, "/"+diskName) { + if strings.HasSuffix(path, diskName) { ui.Message(fmt.Sprintf("Copying from artifact: %s", path)) dstPath := filepath.Join(dir, "box.img") if err = CopyContents(dstPath, path); err != nil { From 2312e25fc48c544b6f439a1ad68e69d6ccfb6482 Mon Sep 17 00:00:00 2001 From: Nico Verzijp Date: Sat, 7 Jan 2023 09:54:41 +0100 Subject: [PATCH 2/2] use filename.Base iso strings.HasSuffix --- post-processor/vagrant/libvirt.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/post-processor/vagrant/libvirt.go b/post-processor/vagrant/libvirt.go index 0edcf686..c5e71332 100644 --- a/post-processor/vagrant/libvirt.go +++ b/post-processor/vagrant/libvirt.go @@ -4,7 +4,6 @@ import ( "fmt" "path/filepath" "strconv" - "strings" packersdk "github.com/hashicorp/packer-plugin-sdk/packer" ) @@ -68,7 +67,7 @@ func (p *LibVirtProvider) Process(ui packersdk.Ui, artifact packersdk.Artifact, // Copy the disk image into the temporary directory (as box.img) for _, path := range artifact.Files() { - if strings.HasSuffix(path, diskName) { + if filepath.Base(path) == diskName { ui.Message(fmt.Sprintf("Copying from artifact: %s", path)) dstPath := filepath.Join(dir, "box.img") if err = CopyContents(dstPath, path); err != nil {