From 66c8ea360f3b0acd61114deadfdaeb356539bea5 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Mon, 9 Jul 2012 01:28:33 +0200
Subject: [PATCH] correct downloadlink

---
 CLIENT_DATA/config.xml    | 2 ++
 CLIENT_DATA/setup3264.ins | 4 ++--
 X16-32217.exe.sha1sum     | 1 -
 X16-32254.exe.sha1sum     | 1 -
 X17-75062.exe.sha1sum     | 1 +
 X17-75168.exe.sha1sum     | 1 +
 builder-product.cfg       | 8 ++++----
 7 files changed, 10 insertions(+), 8 deletions(-)
 delete mode 100644 X16-32217.exe.sha1sum
 delete mode 100644 X16-32254.exe.sha1sum
 create mode 100644 X17-75062.exe.sha1sum
 create mode 100644 X17-75168.exe.sha1sum

diff --git a/CLIENT_DATA/config.xml b/CLIENT_DATA/config.xml
index 25f9c3b..7d031f2 100644
--- a/CLIENT_DATA/config.xml
+++ b/CLIENT_DATA/config.xml
@@ -4,6 +4,8 @@
 	
 	<!-- <Logging Type="standard" Path="%temp%" Template="Microsoft Office Single Image Setup(*).txt" /> -->
 	
+	<PIDKEY Value="BCDFGHJKMPQRTVWXY2346789B" />
+	
 	<USERNAME Value="Customer" />
 	
 	<COMPANYNAME Value="MyCompany" />
diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins
index 785aeab..4f63778 100644
--- a/CLIENT_DATA/setup3264.ins
+++ b/CLIENT_DATA/setup3264.ins
@@ -145,7 +145,7 @@ $Install32Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-32\Updates
 xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir32$" %ScriptPath%\config.xml > $LogDir$\msoffice2010-32.xml
 
 [Winbatch_install_32]
-"$LogDir$\msoffice2010-32\SETUP.EXE" /config "$LogDir$\msoffice2010-32.xml"
+"$LogDir$\msoffice2010-32\setup.exe" /config "$LogDir$\msoffice2010-32.xml"
 
 [Winbatch_remove_32]
 delete -sf "$LogDir$\msoffice2010-32\"
@@ -165,7 +165,7 @@ $Install64Sp1Exe$ /quiet /extract:$LogDir$\msoffice2010-64\Updates
 xml ed -O -u "/Configuration/PIDKEY/@Value" -v $LicenseKey$ -u "/Configuration/USERNAME/@Value" -v %HostID% -u "/Configuration/COMPANYNAME/@Value" -v %HostID% -u "/Configuration/INSTALLLOCATION/@Value" -v "$InstallDir64$" %ScriptPath%\config.xml > $LogDir$\msoffice2010-64.xml
 
 [Winbatch_install_64]
-"$LogDir$\msoffice2010-64\SETUP.EXE" /config "$LogDir$\msoffice2010-64.xml"
+"$LogDir$\msoffice2010-64\setup.exe" /config "$LogDir$\msoffice2010-64.xml"
 
 [Winbatch_remove_64]
 delete -sf "$LogDir$\msoffice2010-64\"
diff --git a/X16-32217.exe.sha1sum b/X16-32217.exe.sha1sum
deleted file mode 100644
index 92ce467..0000000
--- a/X16-32217.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-86da413e893a360b91389bbe9935de42bb75a21a  /home/mario/.opsi-dist-cache/msoffice2010-2010.1/X86_64/X16-32217.exe
diff --git a/X16-32254.exe.sha1sum b/X16-32254.exe.sha1sum
deleted file mode 100644
index 1d08eac..0000000
--- a/X16-32254.exe.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-c2684d10b32204a2d1a70c54e6c2197eb9c63edb  /home/mario/.opsi-dist-cache/msoffice2010-2010.1/X86/X16-32254.exe
diff --git a/X17-75062.exe.sha1sum b/X17-75062.exe.sha1sum
new file mode 100644
index 0000000..203e47e
--- /dev/null
+++ b/X17-75062.exe.sha1sum
@@ -0,0 +1 @@
+6cf5049c1db90f8b799751583b9a2d5958905bca  /home/mario/.opsi-dist-cache/microsoft.office2010-2010.1/X86/X17-75062.exe
diff --git a/X17-75168.exe.sha1sum b/X17-75168.exe.sha1sum
new file mode 100644
index 0000000..644920d
--- /dev/null
+++ b/X17-75168.exe.sha1sum
@@ -0,0 +1 @@
+70a85dcd317ddcdbd2eacb43cac66451d8a66b06  /home/mario/.opsi-dist-cache/microsoft.office2010-2010.1/X86_64/X17-75168.exe
diff --git a/builder-product.cfg b/builder-product.cfg
index d62a9ad..db4c8bc 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -15,8 +15,8 @@ TYPE="restricted"
 DL_FILE[0]="Office2010logo.png"
 DL_SOURCE[0]="http://blog.concurrency.com/wp-content/uploads/2011/10/Office2010logo.png"
 
-DL_FILE[1]="X16-32254.exe"
-DL_SOURCE[1]="http://msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X16-32254.exe"
+DL_FILE[1]="X17-75062.exe"
+DL_SOURCE[1]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X17-75062.exe"
 DL_ARCH[1]="X86"
 DL_WINST_NAME[1]=Install32Exe
 
@@ -25,8 +25,8 @@ DL_SOURCE[2]="http://download.microsoft.com/download/4/3/D/43DB7693-6B64-4DB7-B1
 DL_ARCH[2]="X86"
 DL_WINST_NAME[2]=Install32Sp1Exe
 
-DL_FILE[3]="X16-32217.exe"
-DL_SOURCE[3]="http://msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X16-32217.exe"
+DL_FILE[3]="X17-75168.exe"
+DL_SOURCE[3]="msft.digitalrivercontent.net/01/501016817-10234441--EUR//office2010/X17-75168.exe"
 DL_ARCH[3]="X86_64"
 DL_WINST_NAME[3]=Install64Exe