From 915d01447f0c17af2719f0f0b1e1ec827b8e65f5 Mon Sep 17 00:00:00 2001
From: Mario Fetka <mario.fetka@gmail.com>
Date: Sat, 7 Apr 2012 11:53:43 +0200
Subject: [PATCH] work around for opsi copy without rename support

---
 CLIENT_DATA/delsub32.ins     |  4 +--
 CLIENT_DATA/setup32.ins      | 14 ++++-----
 FeuchteLuft.exe.sha1sum      |  1 +
 FeuchteLuft_340d.zip.sha1sum |  1 -
 TroDaten.exe.sha1sum         |  1 +
 TroDaten_140d.zip.sha1sum    |  1 -
 ZiTroGegen.exe.sha1sum       |  1 +
 ZiTroGegen_120d.zip.sha1sum  |  1 -
 ZiTroKammer.exe.sha1sum      |  1 +
 ZiTroKammer_156d.zip.sha1sum |  1 -
 ZiTroLuft.exe.sha1sum        |  1 +
 ZiTroLuft_210d.zip.sha1sum   |  1 -
 ZiTroMix.exe.sha1sum         |  1 +
 ZiTroMix_101d.zip.sha1sum    |  1 -
 builder-product.cfg          | 58 +++++++++---------------------------
 h-x-Dia.exe.sha1sum          |  1 +
 h-x-Dia_140d.zip.sha1sum     |  1 -
 17 files changed, 30 insertions(+), 60 deletions(-)
 create mode 100644 FeuchteLuft.exe.sha1sum
 delete mode 100644 FeuchteLuft_340d.zip.sha1sum
 create mode 100644 TroDaten.exe.sha1sum
 delete mode 100644 TroDaten_140d.zip.sha1sum
 create mode 100644 ZiTroGegen.exe.sha1sum
 delete mode 100644 ZiTroGegen_120d.zip.sha1sum
 create mode 100644 ZiTroKammer.exe.sha1sum
 delete mode 100644 ZiTroKammer_156d.zip.sha1sum
 create mode 100644 ZiTroLuft.exe.sha1sum
 delete mode 100644 ZiTroLuft_210d.zip.sha1sum
 create mode 100644 ZiTroMix.exe.sha1sum
 delete mode 100644 ZiTroMix_101d.zip.sha1sum
 create mode 100644 h-x-Dia.exe.sha1sum
 delete mode 100644 h-x-Dia_140d.zip.sha1sum

diff --git a/CLIENT_DATA/delsub32.ins b/CLIENT_DATA/delsub32.ins
index 5017297..ecab1bd 100644
--- a/CLIENT_DATA/delsub32.ins
+++ b/CLIENT_DATA/delsub32.ins
@@ -28,8 +28,8 @@ delete -sf "$InstallDir$\"
 [LinkFolder_uninstall]
 ; Example of deleting a folder from AllUsers startmenu:
 ;
-; set_basefolder common_programs
-; delete_subfolder $ProductId$
+set_basefolder common_programs
+delete_subfolder izf.de
 ;
 ; Example of deleting a shortcut from AllUsers desktop:
 ;
diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins
index b90b00b..60774c3 100644
--- a/CLIENT_DATA/setup32.ins
+++ b/CLIENT_DATA/setup32.ins
@@ -75,13 +75,13 @@ endif
 ; Example of recursively copying some files into the installation directory:
 ;
 ; copy -s "%ScriptPath%\files\*.*" "$InstallDir$"
-copy "$FeuchteLuftExe$" "$InstallDir$\FeuchteLuft.exe"
-copy "$h-x-DiaExe$" "$InstallDir$\h-x-Dia.exe"
-copy "$TroDatenExe$" "$InstallDir$\TroDaten.exe"
-copy "$ZiTroGegenExe$" "$InstallDir$\ZiTroGegen.exe"
-copy "$ZiTroKammerExe$" "$InstallDir$\ZiTroKammer.exe"
-copy "$ZiTroLuftExe$" "$InstallDir$\ZiTroLuft.exe"
-copy "$ZiTroMixExe$" "$InstallDir$\ZiTroMix.exe"
+copy "$FeuchteLuftExe$" "$InstallDir$"
+copy "$h-x-DiaExe$" "$InstallDir$"
+copy "$TroDatenExe$" "$InstallDir$"
+copy "$ZiTroGegenExe$" "$InstallDir$"
+copy "$ZiTroKammerExe$" "$InstallDir$"
+copy "$ZiTroLuftExe$" "$InstallDir$"
+copy "$ZiTroMixExe$" "$InstallDir$"
 
 [Registry_install]
 ; Example of setting some values of an registry key:
diff --git a/FeuchteLuft.exe.sha1sum b/FeuchteLuft.exe.sha1sum
new file mode 100644
index 0000000..c744ac8
--- /dev/null
+++ b/FeuchteLuft.exe.sha1sum
@@ -0,0 +1 @@
+d8265b58c309652816997a2becaf1a8da534c797  /home/mario/.opsi-dist-cache/zitro-2008/X86/FeuchteLuft.exe
diff --git a/FeuchteLuft_340d.zip.sha1sum b/FeuchteLuft_340d.zip.sha1sum
deleted file mode 100644
index 4ce6adb..0000000
--- a/FeuchteLuft_340d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-01263fb2535ef2fd7a8806ae4d935c17219be16f  /home/mario/.opsi-dist-cache/zitro-2008/X86/FeuchteLuft_340d.zip
diff --git a/TroDaten.exe.sha1sum b/TroDaten.exe.sha1sum
new file mode 100644
index 0000000..335f494
--- /dev/null
+++ b/TroDaten.exe.sha1sum
@@ -0,0 +1 @@
+4b1b1746894d9dc9eda3e0878a82093b640dcea8  /home/mario/.opsi-dist-cache/zitro-2008/X86/TroDaten.exe
diff --git a/TroDaten_140d.zip.sha1sum b/TroDaten_140d.zip.sha1sum
deleted file mode 100644
index e215ea1..0000000
--- a/TroDaten_140d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-aa46fff50cac65b6af8f536e53a9e9644714b075  /home/mario/.opsi-dist-cache/zitro-2008/X86/TroDaten_140d.zip
diff --git a/ZiTroGegen.exe.sha1sum b/ZiTroGegen.exe.sha1sum
new file mode 100644
index 0000000..538e8a9
--- /dev/null
+++ b/ZiTroGegen.exe.sha1sum
@@ -0,0 +1 @@
+12f52463437bf29095b9ff4122131ad1666ddf3f  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroGegen.exe
diff --git a/ZiTroGegen_120d.zip.sha1sum b/ZiTroGegen_120d.zip.sha1sum
deleted file mode 100644
index 4cd6703..0000000
--- a/ZiTroGegen_120d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-1972850b6afc5400c97887387da1c48b363fb7c5  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroGegen_120d.zip
diff --git a/ZiTroKammer.exe.sha1sum b/ZiTroKammer.exe.sha1sum
new file mode 100644
index 0000000..1e28c50
--- /dev/null
+++ b/ZiTroKammer.exe.sha1sum
@@ -0,0 +1 @@
+7f6ac362a57066fb93c0b280ba3e97397c761298  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroKammer.exe
diff --git a/ZiTroKammer_156d.zip.sha1sum b/ZiTroKammer_156d.zip.sha1sum
deleted file mode 100644
index eee9255..0000000
--- a/ZiTroKammer_156d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-f2a90e6b68a03408388fbd5af49bbdc4073883c6  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroKammer_156d.zip
diff --git a/ZiTroLuft.exe.sha1sum b/ZiTroLuft.exe.sha1sum
new file mode 100644
index 0000000..56e6a3f
--- /dev/null
+++ b/ZiTroLuft.exe.sha1sum
@@ -0,0 +1 @@
+9cd7a0d918cf0131bfb3a5f8070505879df96b49  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroLuft.exe
diff --git a/ZiTroLuft_210d.zip.sha1sum b/ZiTroLuft_210d.zip.sha1sum
deleted file mode 100644
index 6c14292..0000000
--- a/ZiTroLuft_210d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-3c87a861a67a71adeaaf9e077acb724832c90f1d  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroLuft_210d.zip
diff --git a/ZiTroMix.exe.sha1sum b/ZiTroMix.exe.sha1sum
new file mode 100644
index 0000000..17bc1ba
--- /dev/null
+++ b/ZiTroMix.exe.sha1sum
@@ -0,0 +1 @@
+491c4ac835093c4e17d9d6828bf6343b7271b57d  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroMix.exe
diff --git a/ZiTroMix_101d.zip.sha1sum b/ZiTroMix_101d.zip.sha1sum
deleted file mode 100644
index 8f6c2b4..0000000
--- a/ZiTroMix_101d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-85fda8fd77e24411a6c844f8987163ce1211944f  /home/mario/.opsi-dist-cache/zitro-2008/X86/ZiTroMix_101d.zip
diff --git a/builder-product.cfg b/builder-product.cfg
index d325854..405b914 100644
--- a/builder-product.cfg
+++ b/builder-product.cfg
@@ -17,63 +17,33 @@ TYPE="public"
 DL_FILE[0]="logo-klein.gif"
 DL_SOURCE[0]="http://www.izf.de/grafik/logo-klein.gif"
 
-DL_FILE[1]="FeuchteLuft_340d.zip"
-DL_SOURCE[1]="http://www.izf.de/d/d-programme/FeuchteLuft_340d.zip"
+DL_FILE[1]="FeuchteLuft.exe"
+DL_SOURCE[1]="http://www.izf.de/d/d-programme/FeuchteLuft_340d.exe"
 DL_ARCH[1]="X86"
-DL_EXTRACT_FORMAT[1]="unzip"
 
-DL_FILE[2]="h-x-Dia_140d.zip"
-DL_SOURCE[2]="http://www.izf.de/d/d-programme/h-x-Dia_140d.zip"
+DL_FILE[2]="h-x-Dia.exe"
+DL_SOURCE[2]="http://www.izf.de/d/d-programme/h-x-Dia_140d.exe"
 DL_ARCH[2]="X86"
-DL_EXTRACT_FORMAT[2]="unzip"
 
-DL_FILE[3]="TroDaten_140d.zip"
-DL_SOURCE[3]="http://www.izf.de/d/d-programme/TroDaten_140d.zip"
+DL_FILE[3]="TroDaten.exe"
+DL_SOURCE[3]="http://www.izf.de/d/d-programme/TroDaten_140d.exe"
 DL_ARCH[3]="X86"
-DL_EXTRACT_FORMAT[3]="unzip"
 
-DL_FILE[4]="ZiTroLuft_210d.zip"
-DL_SOURCE[4]="http://www.izf.de/d/d-programme/ZiTroLuft_210d.zip"
+DL_FILE[4]="ZiTroLuft.exe"
+DL_SOURCE[4]="http://www.izf.de/d/d-programme/ZiTroLuft_210d.exe"
 DL_ARCH[4]="X86"
-DL_EXTRACT_FORMAT[4]="unzip"
 
-DL_FILE[5]="ZiTroKammer_156d.zip"
-DL_SOURCE[5]="http://www.izf.de/d/d-programme/ZiTroKammer_156d.zip"
+DL_FILE[5]="ZiTroKammer.exe"
+DL_SOURCE[5]="http://www.izf.de/d/d-programme/ZiTroKammer_156d.exe"
 DL_ARCH[5]="X86"
-DL_EXTRACT_FORMAT[5]="unzip"
 
-DL_FILE[6]="ZiTroGegen_120d.zip"
-DL_SOURCE[6]="http://www.izf.de/d/d-programme/ZiTroGegen_120d.zip"
+DL_FILE[6]="ZiTroGegen.exe"
+DL_SOURCE[6]="http://www.izf.de/d/d-programme/ZiTroGegen_120d.exe"
 DL_ARCH[6]="X86"
-DL_EXTRACT_FORMAT[6]="unzip"
 
-DL_FILE[7]="ZiTroMix_101d.zip"
-DL_SOURCE[7]="http://www.izf.de/d/d-programme/ZiTroMix_101d.zip"
+DL_FILE[7]="ZiTroMix.exe"
+DL_SOURCE[7]="http://www.izf.de/d/d-programme/ZiTroMix_101d.exe"
 DL_ARCH[7]="X86"
-DL_EXTRACT_FORMAT[7]="unzip"
 
 # File array index for the image showing while installing the program
 ICON_DL_INDEX=0
-
-WINST_NAME[0]="FeuchteLuftExe"
-WINST_VALUE[0]="@DL_EXTRACT_WINST_PATH[2]@\\FeuchteLuft_340d.exe"
-
-WINST_NAME[1]="h-x-DiaExe"
-WINST_VALUE[1]="@DL_EXTRACT_WINST_PATH[2]@\\h-x-Dia_140d.exe"
-
-WINST_NAME[2]="TroDatenExe"
-WINST_VALUE[2]="@DL_EXTRACT_WINST_PATH[2]@\\TroDaten_140d.exe"
-
-WINST_NAME[3]="ZiTroGegenExe"
-WINST_VALUE[3]="@DL_EXTRACT_WINST_PATH[2]@\\ZiTroGegen_120d.exe"
-
-WINST_NAME[4]="ZiTroKammerExe"
-WINST_VALUE[4]="@DL_EXTRACT_WINST_PATH[2]@\\ZiTroKammer_156d.exe"
-
-WINST_NAME[5]="ZiTroLuftExe"
-WINST_VALUE[5]="@DL_EXTRACT_WINST_PATH[2]@\\ZiTroLuft_210d.exe"
-
-WINST_NAME[6]="ZiTroMixExe"
-WINST_VALUE[6]="@DL_EXTRACT_WINST_PATH[2]@\\ZiTroMix_101d.exe"
-
-
diff --git a/h-x-Dia.exe.sha1sum b/h-x-Dia.exe.sha1sum
new file mode 100644
index 0000000..2c16c51
--- /dev/null
+++ b/h-x-Dia.exe.sha1sum
@@ -0,0 +1 @@
+47be62e27944a1edc8d2129276c952ff6694eeb3  /home/mario/.opsi-dist-cache/zitro-2008/X86/h-x-Dia.exe
diff --git a/h-x-Dia_140d.zip.sha1sum b/h-x-Dia_140d.zip.sha1sum
deleted file mode 100644
index 03cf28b..0000000
--- a/h-x-Dia_140d.zip.sha1sum
+++ /dev/null
@@ -1 +0,0 @@
-d09d1f72cc5263c326389bff0f796c92915d22cf  /home/mario/.opsi-dist-cache/zitro-2008/X86/h-x-Dia_140d.zip