From 758f36ac6d9283d8221674478548a2afb2f2485c Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Sun, 17 Mar 2013 20:33:40 +0100 Subject: [PATCH] correct WinPKG.xml creation --- CLIENT_DATA/control3264.ins | 72 ++++++++++++++++++------------------- CLIENT_DATA/setup3264.ins | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/CLIENT_DATA/control3264.ins b/CLIENT_DATA/control3264.ins index f39b969..d82cb63 100644 --- a/CLIENT_DATA/control3264.ins +++ b/CLIENT_DATA/control3264.ins @@ -118,7 +118,7 @@ if getValue("lastactionrequest", getProductMap) = "once" Winbatch_silver_uninstall endif if ($once_jre7$ = "uninstall") - Winbatch_jre7_uninstall + Dosbatch_jre7_uninstall endif if ($once_AdobeShock$ = "uninstall") Winbatch_AdobeShock_uninstall @@ -150,58 +150,58 @@ if getValue("lastactionrequest", getProductMap) = "once" endif -Winbatch_init_config +DosInAnIcon_init_config if ($dotnet1.1$ = "install") - Winbatch_dotnet1.1_config + DosInAnIcon_dotnet1.1_config endif if ($dotnet2.0$ = "install") - Winbatch_dotnet2.0_config + DosInAnIcon_dotnet2.0_config endif if ($dotnet3.0$ = "install") - Winbatch_dotnet3.0_config + DosInAnIcon_dotnet3.0_config endif if ($dotnet3.5$ = "install") - Winbatch_dotnet3.5_config + DosInAnIcon_dotnet3.5_config endif if ($dotnet4.0$ = "install") - Winbatch_dotnet4.0_config + DosInAnIcon_dotnet4.0_config endif if ($dotnet4.5$ = "install") - Winbatch_dotnet4.5_config + DosInAnIcon_dotnet4.5_config endif if ($msjsharp$ = "install") - Winbatch_msjsharp_config + DosInAnIcon_msjsharp_config endif if ($silver$ = "install") - Winbatch_silver_config + DosInAnIcon_silver_config endif if ($jre7$ = "install") - Winbatch_jre7_config + DosInAnIcon_jre7_config endif if ($AdobeShock$ = "install") - Winbatch_AdobeShock_config + DosInAnIcon_AdobeShock_config endif if ($basicruntimes$ = "install") - Winbatch_basicruntimes_config + DosInAnIcon_basicruntimes_config endif if ($msdx9$ = "install") - Winbatch_msdx9_config + DosInAnIcon_msdx9_config endif if ($msdxm$ = "install") - Winbatch_msdxm_config + DosInAnIcon_msdxm_config endif if ($msvc$ = "install") - Winbatch_msvc_config + DosInAnIcon_msvc_config endif if ($AdobeFlash$ = "install") - Winbatch_AdobeFlash_config + DosInAnIcon_AdobeFlash_config endif -Winbatch_finish_config +DosInAnIcon_finish_config -[Winbatch_init_config] +[DosInAnIcon_init_config] copy "%ScriptPath%\Config\WinPKG.xml" "$LogDir$" copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" @@ -209,67 +209,67 @@ xml ed -O -u "/settings/timer[@value=40]/@value" -v $timer_value$ "$LogDir$\WinP copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/timer[@enabled=0]/@enabled" -v $timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_dotnet1.1_config] +[DosInAnIcon_dotnet1.1_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net1.1']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_dotnet2.0_config] +[DosInAnIcon_dotnet2.0_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net2.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_dotnet3.0_config] +[DosInAnIcon_dotnet3.0_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net3.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_dotnet3.5_config] +[DosInAnIcon_dotnet3.5_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_dotnet4.0_config] +[DosInAnIcon_dotnet4.0_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_dotnet4.5_config] +[DosInAnIcon_dotnet4.5_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_msjsharp_config] +[DosInAnIcon_msjsharp_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_silver_config] +[DosInAnIcon_silver_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='silver']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_jre7_config] +[DosInAnIcon_jre7_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='jre7']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_AdobeShock_config] +[DosInAnIcon_AdobeShock_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='AdobeShock']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_basicruntimes_config] +[DosInAnIcon_basicruntimes_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='basicruntimes']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_msdx9_config] +[DosInAnIcon_msdx9_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='msdx9']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_msdxm_config] +[DosInAnIcon_msdxm_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_msvc_config] +[DosInAnIcon_msvc_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='msvc']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_AdobeFlash_config] +[DosInAnIcon_AdobeFlash_config] copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" xml ed -O -u "/settings/set[@component='AdobeFlash']/@checked" -v 1 "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -[Winbatch_finish_config] +[DosInAnIcon_finish_config] move $LogDir$\WinPKG.xml "%System%" del $LogDir$\WinPKG.xml.old @@ -297,7 +297,7 @@ del $LogDir$\WinPKG.xml.old [Winbatch_silver_uninstall] -[Winbatch_jre7_uninstall] +[DosBatch_jre7_uninstall] ; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\" ; $LogDir$\JavaRa.exe /REMOVEOLD /SILENT /UPDATEDEFS cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index e04e1cd..42d73e8 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -88,7 +88,7 @@ else Files_install_32 /32Bit if ($java_reinstall$ = "1") Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Winbatch_jre_uninstall + Dosbatch_jre_uninstall endif Dosbatch_install_32 Sub_check_exitcode @@ -106,7 +106,7 @@ else Files_install_64 /64Bit if ($java_reinstall$ = "1") Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Winbatch_jre_uninstall + Dosbatch_jre_uninstall endif Dosbatch_install_64 Sub_check_exitcode