From 45d4cf8b36b8eb5f57e6eea06f14946d3aa2c56e Mon Sep 17 00:00:00 2001 From: Matthew Hooker Date: Mon, 12 Dec 2016 18:32:25 -0800 Subject: [PATCH] move powershell module to common --- builder/hyperv/common/driver_ps_4.go | 4 ++-- builder/hyperv/iso/builder.go | 4 ++-- {powershell => common/powershell}/hyperv/hyperv.go | 2 +- {powershell => common/powershell}/powershell.go | 0 {powershell => common/powershell}/powershell_test.go | 0 {powershell => common/powershell}/scriptbuilder.go | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename {powershell => common/powershell}/hyperv/hyperv.go (99%) rename {powershell => common/powershell}/powershell.go (100%) rename {powershell => common/powershell}/powershell_test.go (100%) rename {powershell => common/powershell}/scriptbuilder.go (100%) diff --git a/builder/hyperv/common/driver_ps_4.go b/builder/hyperv/common/driver_ps_4.go index 22152d4cf..030ee8f55 100644 --- a/builder/hyperv/common/driver_ps_4.go +++ b/builder/hyperv/common/driver_ps_4.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/mitchellh/packer/powershell" - "github.com/mitchellh/packer/powershell/hyperv" + "github.com/mitchellh/packer/common/powershell" + "github.com/mitchellh/packer/common/powershell/hyperv" ) type HypervPS4Driver struct { diff --git a/builder/hyperv/iso/builder.go b/builder/hyperv/iso/builder.go index a160d4ab0..44093ccdc 100644 --- a/builder/hyperv/iso/builder.go +++ b/builder/hyperv/iso/builder.go @@ -10,11 +10,11 @@ import ( "github.com/mitchellh/multistep" hypervcommon "github.com/mitchellh/packer/builder/hyperv/common" "github.com/mitchellh/packer/common" + powershell "github.com/mitchellh/packer/common/powershell" + "github.com/mitchellh/packer/common/powershell/hyperv" "github.com/mitchellh/packer/helper/communicator" "github.com/mitchellh/packer/helper/config" "github.com/mitchellh/packer/packer" - powershell "github.com/mitchellh/packer/powershell" - "github.com/mitchellh/packer/powershell/hyperv" "github.com/mitchellh/packer/template/interpolate" ) diff --git a/powershell/hyperv/hyperv.go b/common/powershell/hyperv/hyperv.go similarity index 99% rename from powershell/hyperv/hyperv.go rename to common/powershell/hyperv/hyperv.go index 67e26216a..e57a98f0d 100644 --- a/powershell/hyperv/hyperv.go +++ b/common/powershell/hyperv/hyperv.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/mitchellh/packer/powershell" + "github.com/mitchellh/packer/common/powershell" ) func GetHostAdapterIpAddressForSwitch(switchName string) (string, error) { diff --git a/powershell/powershell.go b/common/powershell/powershell.go similarity index 100% rename from powershell/powershell.go rename to common/powershell/powershell.go diff --git a/powershell/powershell_test.go b/common/powershell/powershell_test.go similarity index 100% rename from powershell/powershell_test.go rename to common/powershell/powershell_test.go diff --git a/powershell/scriptbuilder.go b/common/powershell/scriptbuilder.go similarity index 100% rename from powershell/scriptbuilder.go rename to common/powershell/scriptbuilder.go