From 7e0fe0cddd20751e119f99df01e42a18c190d3da Mon Sep 17 00:00:00 2001
From: Chris Bednarski <banzaimonkey@gmail.com>
Date: Tue, 23 Feb 2016 18:36:04 -0800
Subject: [PATCH] Added merge script to automatically pull in and fix the
 upstream repo

---
 azure-merge.sh | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100755 azure-merge.sh

diff --git a/azure-merge.sh b/azure-merge.sh
new file mode 100755
index 000000000..07c79b8b3
--- /dev/null
+++ b/azure-merge.sh
@@ -0,0 +1,18 @@
+PACKER=$GOPATH/src/github.com/mitchellh/packer
+AZURE=/tmp/packer-azure
+
+ls $AZURE >/dev/null || git clone https://github.com/Azure/packer-azure /tmp/packer-azure
+PWD=`pwd`
+cd $AZURE && git pull
+cd $PWD
+
+# copy things
+cp -r $AZURE/packer/builder/azure $PACKER/builder/
+cp -r $AZURE/packer/communicator/* $PACKER/communicator/
+cp -r $AZURE/packer/provisioner/azureVmCustomScriptExtension $PACKER/provisioner/
+
+# remove legacy API client
+rm -rf $PACKER/builder/azure/smapi
+
+# fix imports
+find $PACKER/builder/azure/ -type f | grep ".go" | xargs sed -e 's/Azure\/packer-azure\/packer\/builder\/azure/mitchellh\/packer\/builder\/azure/g' -i ''