Merge branch 'release-1.14'

CHANGELOG.md

+## v1.14 (May 6th, 2014)
+
+* Compact generated VMs using ultradefrag and sdelete (#53)
+* Fix 2008 R2 Core Autounattend.xml steps
+
 ## v1.13 (May 2nd, 2014)
 
 * Fixed ISO Urls (#47)

answer_files/2008_r2_core/Autounattend.xml

@@ -143,13 +143,13 @@
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
-                    <CommandLine>cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
+                    <CommandLine>cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
                     <Description>Set Execution Policy 64 Bit</Description>
                     <Order>7</Order>
                     <RequiresUserInput>true</RequiresUserInput>
                 </SynchronousCommand>
                 <SynchronousCommand wcm:action="add">
-                    <CommandLine>C:\Windows\SysWOW64\cmd.exe /c powershell -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
+                    <CommandLine>C:\Windows\SysWOW64\cmd.exe /c C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe -Command "Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Force"</CommandLine>
                     <Description>Set Execution Policy 32 Bit</Description>
                     <Order>8</Order>
                     <RequiresUserInput>true</RequiresUserInput>

scripts/compact.bat

+if not exist "C:\Windows\Temp\7z920-x64.msi" (
+	powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://downloads.sourceforge.net/sevenzip/7z920-x64.msi', 'C:\Windows\Temp\7z920-x64.msi')" <NUL
+)
+msiexec /qb /i C:\Windows\Temp\7z920-x64.msi
+
+if not exist "C:\Windows\Temp\ultradefrag.zip" (
+	powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://downloads.sourceforge.net/ultradefrag/ultradefrag-portable-6.0.2.bin.amd64.zip', 'C:\Windows\Temp\ultradefrag.zip')" <NUL
+)
+
+if not exist "C:\Windows\Temp\ultradefrag-portable-6.0.2.amd64\udefrag.exe" (
+	cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\ultradefrag.zip -oC:\Windows\Temp"
+)
+
+if not exist "C:\Windows\Temp\SDelete.zip" (
+  powershell -Command "(New-Object System.Net.WebClient).DownloadFile('http://download.sysinternals.com/files/SDelete.zip', 'C:\Windows\Temp\SDelete.zip')" <NUL
+)
+
+if not exist "C:\Windows\Temp\sdelete.exe" (
+	cmd /c ""C:\Program Files\7-Zip\7z.exe" x C:\Windows\Temp\SDelete.zip -oC:\Windows\Temp"
+)
+
+msiexec /qb /x C:\Windows\Temp\7z920-x64.msi
+
+cmd /c C:\Windows\Temp\ultradefrag-portable-6.0.2.amd64\udefrag.exe --optimize --repeat C:
+
+cmd /c %SystemRoot%\System32\reg.exe ADD HKCU\Software\Sysinternals\SDelete /v EulaAccepted /t REG_DWORD /d 1 /f
+cmd /c C:\Windows\Temp\sdelete.exe -q -z C:

windows_2008_r2.json

@@ -62,7 +62,8 @@
             "scripts": [
                 "./scripts/vm-guest-tools.bat",
                 "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
+                "./scripts/vagrant-ssh.bat",
+                "./scripts/compact.bat"
             ]
         },
         {

windows_2008_r2_core.json

@@ -58,7 +58,8 @@
       "scripts": [
         "./scripts/vm-guest-tools.bat",
         "./scripts/chef.bat",
-        "./scripts/vagrant-ssh.bat"
+        "./scripts/vagrant-ssh.bat",
+        "./scripts/compact.bat"
      ]
     }, {
       "type": "shell", "inline": ["rm -rf /tmp/*"]

windows_2012_r2.json

@@ -62,7 +62,8 @@
             "scripts": [
                 "./scripts/vm-guest-tools.bat",
                 "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
+                "./scripts/vagrant-ssh.bat",
+                "./scripts/compact.bat"
             ]
         },
         {

windows_2012_r2_core.json

@@ -62,7 +62,8 @@
             "scripts": [
                 "./scripts/vm-guest-tools.bat",
                 "./scripts/chef.bat",
-                "./scripts/vagrant-ssh.bat"
+                "./scripts/vagrant-ssh.bat",
+                "./scripts/compact.bat"
             ]
         },
         {