Merge branch 'release-1.5'

joefitzgerald · Jan 9, 2014 · f0f0b3c · f0f0b3c
2 parents 9123d11 + aa72007
commit f0f0b3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## v1.5 (January 9, 2014)
+
+* Fix issue with installation of VM guest tools [GH-23]
+
 ## v1.4 (December 31, 2013)
 
 * Update .json files to work with Packer 0.5.0 (the `vmware` builder is renamed to `vmware-iso`, the `virtualbox` builder is renamed to `virtualbox-iso`)

diff --git a/scripts/vm-guest-tools.bat b/scripts/vm-guest-tools.bat
@@ -3,8 +3,8 @@ if not exist "C:\Windows\Temp\7z920-x64.msi" (
 )
 msiexec /qb /i C:\Windows\Temp\7z920-x64.msi
 
-if "%PACKER_BUILDER_TYPE%" equ "vmware" goto :vmware
-if "%PACKER_BUILDER_TYPE%" equ "virtualbox" goto :virtualbox
+if "%PACKER_BUILDER_TYPE%" equ "vmware-iso" goto :vmware
+if "%PACKER_BUILDER_TYPE%" equ "virtualbox-iso" goto :virtualbox
 goto :done
 
 :vmware