From 3f271181851f8d92e670738b270a3e9a0c083b32 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Mon, 1 Apr 2013 10:30:15 +0200 Subject: [PATCH] redesign to update properties via webservices --- CLIENT_DATA/cleanup3264.ins | 276 ++++++++----- CLIENT_DATA/config3264.ins | 69 +--- CLIENT_DATA/define3264.inc | 40 ++ CLIENT_DATA/once3264.ins | 230 ----------- CLIENT_DATA/setup.ins | 477 ---------------------- CLIENT_DATA/setup3264.inc | 30 -- CLIENT_DATA/setup3264.ins | 81 ++-- CLIENT_DATA/uninstall3264.ins | 11 +- OPSI/control | 235 ++--------- aio-runtimes_v2.0.3.1.7z.sha1sum | 1 - builder-product.cfg | 30 +- builder-targets-cb.sh | 4 +- dimpel-aio-runtimes_v2.0.3.1.1.7z.sha1sum | 1 - 13 files changed, 326 insertions(+), 1159 deletions(-) create mode 100644 CLIENT_DATA/define3264.inc delete mode 100644 CLIENT_DATA/once3264.ins delete mode 100644 CLIENT_DATA/setup.ins delete mode 100644 CLIENT_DATA/setup3264.inc delete mode 100644 aio-runtimes_v2.0.3.1.7z.sha1sum delete mode 100644 dimpel-aio-runtimes_v2.0.3.1.1.7z.sha1sum diff --git a/CLIENT_DATA/cleanup3264.ins b/CLIENT_DATA/cleanup3264.ins index 89c7e19..f564d54 100644 --- a/CLIENT_DATA/cleanup3264.ins +++ b/CLIENT_DATA/cleanup3264.ins @@ -1,110 +1,178 @@ +DefStringList $productProperty$ -Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" +DefVar $reboot$ +Set $reboot$ = "false" -Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" - -if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - if FileExists($IniFile32$) - Set $OnceUninstallDone32$ = GetValueFromInifile($IniFile32$,"COMMON","OnceUninstallDone","false") - endif +if ($sereby_dotnet1.1$ = "uninstall") + Winbatch_dotnet1.1_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet1.1") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_dotnet2.0$ = "uninstall") + Winbatch_dotnet2.0_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet2.0") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_dotnet3.0$ = "uninstall") + Winbatch_dotnet3.0_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet3.0") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_dotnet3.5$ = "uninstall") + Winbatch_dotnet3.5_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet3.5") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_dotnet4.0$ = "uninstall") + Winbatch_dotnet4.0_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet4.0") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_dotnet4.5$ = "uninstall") + Winbatch_dotnet4.5_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_dotnet4.5") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_msjsharp$ = "uninstall") + Winbatch_msjsharp_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_msjsharp") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_silver$ = "uninstall") + Winbatch_silver_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_silver") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_jre$ = "uninstall") + Dosbatch_jre_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_jre") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_AdobeShock$ = "uninstall") + Winbatch_AdobeShock_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_AdobeShock") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_basicruntimes$ = "uninstall") + Winbatch_basicruntimes_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_basicruntimes") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_msdx9$ = "uninstall") + Winbatch_msdx9_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_msdx9") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_msdxm$ = "uninstall") + Winbatch_msdxm_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_msdxm") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_msvc$ = "uninstall") + Winbatch_msvc_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_msvc") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_AdobeFlash$ = "uninstall") + Winbatch_AdobeFlash_uninstall + set $productProperty$ = addtolist($productProperty$, "[newmap]") + set $productProperty$ = addtolist($productProperty$, "type=productProperty") + set $productProperty$ = addtolist($productProperty$, "productId=$ProductId$") + set $productProperty$ = addtolist($productProperty$, "property=sereby_AdobeFlash") + set $productProperty$ = addtolist($productProperty$, "value=install") + set $productProperty$ = addtolist($productProperty$, "objectId=%opsiserviceUser%") + Set $reboot$ = "true" +endif +if ($sereby_java_reinstall$ = "true") + Dosbatch_java_reinstall endif -if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - if FileExists($IniFile64$) - Set $OnceUninstallDone64$ = GetValueFromInifile($IniFile64$,"COMMON","OnceUninstallDone","false") - endif +markErrorNumber +OpsiServiceHashList_productProperty_updateObjects +if errorsOccuredSinceMark > 0 + isFatalError endif -DefVar $once_dotnet1.1$ -Set $once_dotnet1.1$ = GetProductProperty("once_dotnet1.1", "uninstall") -DefVar $once_dotnet2.0$ -Set $once_dotnet2.0$ = GetProductProperty("once_dotnet2.0", "uninstall") -DefVar $once_dotnet3.0$ -Set $once_dotnet3.0$ = GetProductProperty("once_dotnet3.0", "uninstall") -DefVar $once_dotnet3.5$ -Set $once_dotnet3.5$ = GetProductProperty("once_dotnet3.5", "nninstall") -DefVar $once_dotnet4.0$ -Set $once_dotnet4.0$ = GetProductProperty("once_dotnet4.0", "uninstall") -DefVar $once_dotnet4.5$ -Set $once_dotnet4.5$ = GetProductProperty("once_dotnet4.5", "uninstall") -DefVar $once_msjsharp$ -Set $once_msjsharp$ = GetProductProperty("once_msjsharp", "uninstall") -DefVar $once_silver$ -Set $once_silver$ = GetProductProperty("once_silver", "uninstall") -DefVar $once_jre7$ -Set $once_jre7$ = GetProductProperty("once_jre7", "uninstall") -DefVar $once_AdobeShock$ -Set $once_AdobeShock$ = GetProductProperty("once_AdobeShock", "uninstall") -DefVar $once_basicruntimes$ -Set $once_basicruntimes$ = GetProductProperty("once_basicruntimes", "uninstall") -DefVar $once_msdx9$ -Set $once_msdx9$ = GetProductProperty("once_msdx9", "uninstall") -DefVar $once_msdxm$ -Set $once_msdxm$ = GetProductProperty("once_msdxm", "uninstall") -DefVar $once_msvc$ -Set $once_msvc$ = GetProductProperty("once_msvc", "uninstall") -DefVar $once_AdobeFlash$ -Set $once_AdobeFlash$ = GetProductProperty("once_AdobeFlash", "uninstall") - - - -if ($OnceUninstallDone32$ = "false") or ($OnceUninstallDone64$ = "false") - if ($once_dotnet1.1$ = "uninstall") - Winbatch_dotnet1.1_uninstall - endif - if ($once_dotnet2.0$ = "uninstall") - Winbatch_dotnet2.0_uninstall - endif - if ($once_dotnet3.0$ = "uninstall") - Winbatch_dotnet3.0_uninstall - endif - if ($once_dotnet3.5$ = "uninstall") - Winbatch_dotnet3.5_uninstall - endif - if ($once_dotnet4.0$ = "uninstall") - Winbatch_dotnet4.0_uninstall - endif - if ($once_dotnet4.5$ = "uninstall") - Winbatch_dotnet4.5_uninstall - endif - if ($once_msjsharp$ = "uninstall") - Winbatch_msjsharp_uninstall - endif - if ($once_silver$ = "uninstall") - Winbatch_silver_uninstall - endif - if ($once_jre7$ = "uninstall") - Dosbatch_jre7_uninstall - endif - if ($once_AdobeShock$ = "uninstall") - Winbatch_AdobeShock_uninstall - endif - if ($once_basicruntimes$ = "uninstall") - Winbatch_basicruntimes_uninstall - endif - if ($once_msdx9$ = "uninstall") - Winbatch_msdx9_uninstall - endif - if ($once_msdxm$ = "uninstall") - Winbatch_msdxm_uninstall - endif - if ($once_msvc$ = "uninstall") - Winbatch_msvc_uninstall - endif - if ($once_AdobeFlash$ = "uninstall") - Winbatch_AdobeFlash_uninstall - endif - if FileExists($IniFile32$) - Winbatch_once_inifile_32 - endif - if FileExists($IniFile64$) - Winbatch_once_inifile_64 - endif +if ($reboot$ = "true") comment "uninstall done now force Reboot" ExitWindows /ImmediateReboot endif - +[OpsiServiceHashList_productProperty_updateObjects] +"method": "productProperty_updateObjects" +"HashList": "$productProperty$" +"params": [ + ] [Winbatch_dotnet1.1_uninstall] %ScriptPath%\UnInstall\NET\cleanup_tool.exe /q:a /c:"cleanup.exe /p .NET Framework 1.1 /u" @@ -128,11 +196,16 @@ endif [Winbatch_silver_uninstall] -[DosBatch_jre7_uninstall] +[DosBatch_jre_uninstall] ; copy "%ScriptPath%\UnInstall\Package\JRE\JavaRa.*" "$LogDir$\" -; $LogDir$\JavaRa.exe /REMOVEOLD /SILENT /UPDATEDEFS +; $LogDir$\JavaRa.exe /SILENT /PURGE /UPDATEDEFS +@echo off cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /keeponly +[Dosbatch_java_reinstall] +@echo off +cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly + [Winbatch_AdobeShock_uninstall] [Winbatch_basicruntimes_uninstall] @@ -146,9 +219,4 @@ cscript /nologo "%ScriptPath%\UnInstall\Package\JRE\JavaUninstallScript.vbs" /ke [Winbatch_AdobeFlash_uninstall] -[Winbatch_once_inifile_32] -inifile "$IniFile32$" [COMMON] OnceUninstallDone=true - -[Winbatch_once_inifile_64] -inifile "$IniFile64$" [COMMON] OnceUninstallDone=true diff --git a/CLIENT_DATA/config3264.ins b/CLIENT_DATA/config3264.ins index 90c023e..86d293d 100644 --- a/CLIENT_DATA/config3264.ins +++ b/CLIENT_DATA/config3264.ins @@ -1,84 +1,49 @@ -DefVar $timer_value$ -Set $timer_value$ = GetProductProperty("timer_value", "40") -DefVar $timer_enabled$ -Set $timer_enabled$ = GetProductProperty("timer_enabled", "1") -DefVar $dotnet1.1$ -Set $dotnet1.1$ = GetProductProperty("dotnet1.1", "install") -;DefVar $dotnet2.0$ -;Set $dotnet2.0$ = GetProductProperty("dotnet2.0", "install") -;DefVar $dotnet3.0$ -;Set $dotnet3.0$ = GetProductProperty("dotnet3.0", "install") -;DefVar $dotnet3.5$ -;Set $dotnet3.5$ = GetProductProperty("dotnet3.5", "install") -DefVar $dotnet4.0$ -Set $dotnet4.0$ = GetProductProperty("dotnet4.0", "none") -DefVar $dotnet4.5$ -Set $dotnet4.5$ = GetProductProperty("dotnet4.5", "install") -DefVar $msjsharp$ -Set $msjsharp$ = GetProductProperty("msjsharp", "install") -DefVar $silver$ -Set $silver$ = GetProductProperty("silver", "install") -DefVar $jre7$ -Set $jre7$ = GetProductProperty("jre7", "install") -DefVar $AdobeShock$ -Set $AdobeShock$ = GetProductProperty("AdobeShock", "install") -DefVar $basicruntimes$ -Set $basicruntimes$ = GetProductProperty("basicruntimes", "install") -DefVar $msdx9$ -Set $msdx9$ = GetProductProperty("msdx9", "install") -DefVar $msdxm$ -Set $msdxm$ = GetProductProperty("msdxm", "install") -DefVar $msvc$ -Set $msvc$ = GetProductProperty("msvc", "install") -DefVar $AdobeFlash$ -Set $AdobeFlash$ = GetProductProperty("AdobeFlash", "install") - DosInAnIcon_init_config -if ($dotnet1.1$ = "install") +if ($sereby_dotnet1.1$ = "install") DosInAnIcon_dotnet1.1_config endif -if ($dotnet2.0$ = "install") +if ($sereby_dotnet2.0$ = "install") DosInAnIcon_dotnet2.0_config endif -if ($dotnet3.0$ = "install") +if ($sereby_dotnet3.0$ = "install") DosInAnIcon_dotnet3.0_config endif -if ($dotnet3.5$ = "install") +if ($sereby_dotnet3.5$ = "install") DosInAnIcon_dotnet3.5_config endif -if ($dotnet4.0$ = "install") +if ($sereby_dotnet4.0$ = "install") DosInAnIcon_dotnet4.0_config endif -if ($dotnet4.5$ = "install") +if ($sereby_dotnet4.5$ = "install") DosInAnIcon_dotnet4.5_config endif -if ($msjsharp$ = "install") +if ($sereby_msjsharp$ = "install") DosInAnIcon_msjsharp_config endif -if ($silver$ = "install") +if ($sereby_silver$ = "install") DosInAnIcon_silver_config endif -if ($jre7$ = "install") - DosInAnIcon_jre7_config +if ($sereby_jre$ = "install") + DosInAnIcon_jre_config endif -if ($AdobeShock$ = "install") +if ($sereby_AdobeShock$ = "install") DosInAnIcon_AdobeShock_config endif -if ($basicruntimes$ = "install") +if ($sereby_basicruntimes$ = "install") DosInAnIcon_basicruntimes_config endif -if ($msdx9$ = "install") +if ($sereby_msdx9$ = "install") DosInAnIcon_msdx9_config endif -if ($msdxm$ = "install") +if ($sereby_msdxm$ = "install") DosInAnIcon_msdxm_config endif -if ($msvc$ = "install") +if ($sereby_msvc$ = "install") DosInAnIcon_msvc_config endif -if ($AdobeFlash$ = "install") +if ($sereby_AdobeFlash$ = "install") DosInAnIcon_AdobeFlash_config endif @@ -125,7 +90,7 @@ xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v 1 "$LogDir$\WinP 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" -[DosInAnIcon_jre7_config] +[DosInAnIcon_jre_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" diff --git a/CLIENT_DATA/define3264.inc b/CLIENT_DATA/define3264.inc new file mode 100644 index 0000000..aa16d20 --- /dev/null +++ b/CLIENT_DATA/define3264.inc @@ -0,0 +1,40 @@ +DefVar $MSVersion$ +Set $MSVersion$ = GetMsVersionInfo +DefVar $sereby_java_reinstall$ +Set $sereby_java_reinstall$ = GetProductProperty("sereby_java_reinstall", "true") +DefVar $sereby_timer_value$ +Set $sereby_timer_value$ = GetProductProperty("sereby_timer_value", "40") +DefVar $sereby_timer_enabled$ +Set $sereby_timer_enabled$ = GetProductProperty("sereby_timer_enabled", "1") +DefVar $sereby_dotnet1.1$ +Set $sereby_dotnet1.1$ = GetProductProperty("sereby_dotnet1.1", "install") +DefVar $sereby_dotnet2.0$ +Set $sereby_dotnet2.0$ = GetProductProperty("sereby_dotnet2.0", "install") +DefVar $sereby_dotnet3.0$ +Set $sereby_dotnet3.0$ = GetProductProperty("sereby_dotnet3.0", "install") +DefVar $sereby_dotnet3.5$ +Set $sereby_dotnet3.5$ = GetProductProperty("sereby_dotnet3.5", "install") +DefVar $sereby_dotnet4.0$ +Set $sereby_dotnet4.0$ = GetProductProperty("sereby_dotnet4.0", "none") +DefVar $sereby_dotnet4.5$ +Set $sereby_dotnet4.5$ = GetProductProperty("sereby_dotnet4.5", "install") +DefVar $sereby_msjsharp$ +Set $sereby_msjsharp$ = GetProductProperty("sereby_msjsharp", "install") +DefVar $sereby_silver$ +Set $sereby_silver$ = GetProductProperty("sereby_silver", "install") +DefVar $sereby_jre$ +Set $sereby_jre$ = GetProductProperty("sereby_jre", "install") +DefVar $sereby_AdobeShock$ +Set $sereby_AdobeShock$ = GetProductProperty("sereby_AdobeShock", "install") +DefVar $sereby_basicruntimes$ +Set $sereby_basicruntimes$ = GetProductProperty("sereby_basicruntimes", "install") +DefVar $sereby_msdx9$ +Set $sereby_msdx9$ = GetProductProperty("sereby_msdx9", "install") +DefVar $sereby_msdxm$ +Set $sereby_msdxm$ = GetProductProperty("sereby_msdxm", "install") +DefVar $sereby_msvc$ +Set $sereby_msvc$ = GetProductProperty("sereby_msvc", "install") +DefVar $sereby_AdobeFlash$ +Set $sereby_AdobeFlash$ = GetProductProperty("sereby_AdobeFlash", "install") + + diff --git a/CLIENT_DATA/once3264.ins b/CLIENT_DATA/once3264.ins deleted file mode 100644 index af671e2..0000000 --- a/CLIENT_DATA/once3264.ins +++ /dev/null @@ -1,230 +0,0 @@ -; Copyright (c) uib gmbh (www.uib.de) -; This sourcecode is owned by uib -; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/en/credits/ - -[Actions] -include_append "setup3264.inc" - -requiredWinstVersion >= "4.11.2.6" - -DefVar $UninstallProgram32$ -DefVar $UninstallProgramOld32$ -DefVar $IniFile32$ -DefVar $UninstallProgram64$ -DefVar $UninstallProgramOld64$ -DefVar $IniFile64$ -DefVar $IniCfgFile$ -DefVar $LogDir$ -DefVar $ProductId$ -DefVar $MinimumSpace$ -DefVar $InstallDir32$ -DefVar $InstallDir64$ -DefVar $ExitCode$ -DefVar $INST_SystemType$ -DefVar $INST_architecture$ -DefVar $OLD_VERSION$ -DefVar $OLD_CREATOR_TAG$ -DefVar $OLD_RELEASE$ -DefVar $OnceUninstallDone32$ -DefVar $OnceUninstallDone64$ - -Set $INST_SystemType$ = GetSystemType -set $INST_architecture$ = GetProductProperty("install_architecture","system specific") - -DefVar $java_reinstall$ -Set $java_reinstall$ = GetProductProperty("java_reinstall", "1") - -DefVar $MSVersion$ -Set $MSVersion$ = GetMsVersionInfo - -DefVar $dotnet2.0$ -Set $dotnet2.0$ = GetProductProperty("dotnet2.0", "install") -DefVar $dotnet3.0$ -Set $dotnet3.0$ = GetProductProperty("dotnet3.0", "install") -DefVar $dotnet3.5$ -Set $dotnet3.5$ = GetProductProperty("dotnet3.5", "install") - -Set $LogDir$ = "%SystemDrive%\tmp" - -; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh -; and adds the following variables: -; from builder-product.cfg : all variables definded by attribute WINST[index] -; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE -; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL -; auto generated winst-variables -; $IconFile$: path to product picture -; -@@BUILDER_VARIABLES@@ - -; ---------------------------------------------------------------- -; - Please edit the following values - -; ---------------------------------------------------------------- -;$ProductId$ should be the name of the product in opsi -; therefore please: only lower letters, no umlauts, -; no white space use '-' as a seperator -Set $MinimumSpace$ = "400 MB" -; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\Sereby AIO" -Set $InstallDir64$ = "%ProgramFiles64Dir%\Sereby AIO" -; ---------------------------------------------------------------- - -Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" -Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" -Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" - -if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) - LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError - ; Stop process and set installation status to failed -else - comment "Show product picture" - ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ - - if FileExists("%ScriptPath%\cleanup3264.ins") - comment "Start uninstall sub section" - Sub "%ScriptPath%\cleanup3264.ins" - endif - - if FileExists("%ScriptPath%\config3264.ins") - comment "Start uninstall sub section" - Sub "%ScriptPath%\config3264.ins" - endif - - comment "installing" - - if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." - comment "Start setup program" - ChangeDirectory "%SCRIPTPATH%" - comment "Copy files" - Files_install_32 /32Bit - - if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) - comment "Install Netframework 2.0 - 3.5 for Windows 8" - if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) - Message "Install Netframework 2.0 - 3.5 for Windows 8" - Dosbatch_install_dotNet_2-3.5_8 winst /SysNative - else - LogError "Not compatible without Netframework 3.5 for Windows 8" - isFatalError - endif - endif - - if ($java_reinstall$ = "1") - Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Dosbatch_java_reinstall - endif - DosInAnIcon_install_32 - Sub_check_exitcode - comment "Patch Registry" - Registry_install /32Bit - comment "Create shortcuts" - LinkFolder_install - endif - - if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." - comment "Start setup program" - ChangeDirectory "%SCRIPTPATH%" - comment "Copy files" - Files_install_64 /64Bit - - if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) - comment "Install Netframework 2.0 - 3.5 for Windows 8" - if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) - Message "Install Netframework 2.0 - 3.5 for Windows 8" - Dosbatch_install_dotNet_2-3.5_8 winst /SysNative - else - LogError "Not compatible without Netframework 3.5 for Windows 8" - isFatalError - endif - endif - - if ($java_reinstall$ = "1") - Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Dosbatch_java_reinstall - endif - DosInAnIcon_install_64 - Sub_check_exitcode - comment "Patch Registry" - Registry_install /64Bit - comment "Create shortcuts" - LinkFolder_install - endif - - comment "Reboot" - ExitWindows /Reboot -endif - -[Registry_install] -; Example of setting some values of an registry key: -; -; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$] -; set "name1" = "some string value" -; set "name2" = REG_DWORD:0001 -; set "name3" = REG_BINARY:00 af 99 cd - -[LinkFolder_install] -; Example of deleting a folder from AllUsers startmenu: -; -; set_basefolder common_programs -; delete_subfolder $ProductId$ -; -; Example of creating an shortcut to the installed exe in AllUsers startmenu: -; -; set_basefolder common_programs -; set_subfolder $ProductId$ -; -; set_link -; name: $ProductId$ -; target: -; parameters: -; working_dir: $InstallDir$ -; icon_file: -; icon_index: -; end_link -; -; Example of creating an shortcut to the installed exe on AllUsers desktop: -; -; set_basefolder common_desktopdirectory -; set_subfolder "" -; -; set_link -; name: $ProductId$ -; target: -; parameters: -; working_dir: $InstallDir$ -; icon_file: -; icon_index: 2 -; end_link - -[Sub_check_exitcode] -comment "Test for installation success via exit code" -set $ExitCode$ = getLastExitCode -; informations to exit codes see -; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx -; http://msdn.microsoft.com/en-us/library/aa368542.aspx -if ($ExitCode$ = "0") - comment "Looks good: setup program gives exitcode zero" -else - comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ - if ($ExitCode$ = "1605") - comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." - comment "Uninstall of a not installed product failed - no problem" - else - if ($ExitCode$ = "1641") - comment "looks good: setup program gives exitcode 1641" - comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." - else - if ($ExitCode$ = "3010") - comment "looks good: setup program gives exitcode 3010" - comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." - else - logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ - isFatalError - endif - endif - endif -endif - diff --git a/CLIENT_DATA/setup.ins b/CLIENT_DATA/setup.ins deleted file mode 100644 index 1d1f133..0000000 --- a/CLIENT_DATA/setup.ins +++ /dev/null @@ -1,477 +0,0 @@ -; Copyright (c) uib gmbh (www.uib.de) -; This sourcecode is owned by uib -; and published under the Terms of the General Public License. -; credits: http://www.opsi.org/credits/ - -[Actions] -requiredWinstVersion >= "4.10.8.6" - -DefVar $MsiId32$ -DefVar $UninstallProgram32$ -DefVar $MsiId64$ -DefVar $UninstallProgram64$ -DefVar $LogDir$ -DefVar $ProductId$ -DefVar $MinimumSpace$ -DefVar $InstallDir32$ -DefVar $InstallDir64$ -DefVar $ExitCode$ -DefVar $LicenseRequired$ -DefVar $LicenseKey$ -DefVar $LicensePool$ -DefVar $INST_SystemType$ -DefVar $INST_architecture$ - -Set $INST_SystemType$ = GetSystemType -set $INST_architecture$ = GetProductProperty("install_architecture","system specific") - -Set $LogDir$ = "%SystemDrive%\tmp" - -DefVar $MSVersion$ -Set $MSVersion$ = GetMsVersionInfo - -DefVar $win8_net3.5$ -Set $win8_net3.5$ = GetProductProperty("win8_net3.5", "1") - -DefVar $java_reinstall$ -Set $java_reinstall$ = GetProductProperty("java_reinstall", "1") - -DefVar $extract_install$ -Set $extract_install$ = GetProductProperty("extract_install", "0") -DefVar $extract_use$ -Set $extract_use$ = GetProductProperty("extract_use", "0") - -DefVar $connection_set_max_latency$ -Set $connection_set_max_latency$ = GetProductProperty("connection_set_max_latency", "30") -DefVar $connection_wan$ -DefStringList $Output$ - -DefVar $timer_value$ -Set $timer_value$ = GetProductProperty("timer_value", "40") -DefVar $timer_enabled$ -Set $timer_enabled$ = GetProductProperty("timer_enabled", "1") -DefVar $inst_net1.1$ -Set $inst_net1.1$ = GetProductProperty("inst_net1.1", "1") -DefVar $inst_net2.0$ -Set $inst_net2.0$ = GetProductProperty("inst_net2.0", "1") -DefVar $inst_net3.0$ -Set $inst_net3.0$ = GetProductProperty("inst_net3.0", "1") -DefVar $inst_net3.5$ -Set $inst_net3.5$ = GetProductProperty("inst_net3.5", "1") -DefVar $inst_net4.0$ -Set $inst_net4.0$ = GetProductProperty("inst_net4.0", "0") -DefVar $inst_net4.5$ -Set $inst_net4.5$ = GetProductProperty("inst_net4.5", "1") -DefVar $inst_msjsharp$ -Set $inst_msjsharp$ = GetProductProperty("inst_msjsharp", "1") -DefVar $inst_silver$ -Set $inst_silver$ = GetProductProperty("inst_silver", "1") -DefVar $inst_jre7$ -Set $inst_jre7$ = GetProductProperty("inst_jre7", "1") -DefVar $inst_AdobeShock$ -Set $inst_AdobeShock$ = GetProductProperty("inst_AdobeShock", "1") -DefVar $inst_basicruntimes$ -Set $inst_basicruntimes$ = GetProductProperty("inst_basicruntimes", "1") -DefVar $inst_msdx9$ -Set $inst_msdx9$ = GetProductProperty("inst_msdx9", "1") -DefVar $inst_msdxm$ -Set $inst_msdxm$ = GetProductProperty("inst_msdxm", "1") -DefVar $inst_msvc$ -Set $inst_msvc$ = GetProductProperty("inst_msvc", "1") -DefVar $inst_AdobeFlash$ -Set $inst_AdobeFlash$ = GetProductProperty("inst_AdobeFlash", "1") - -; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh -; and adds the following variables: -; from builder-product.cfg : all variables definded by attribute WINST[index] -; from builder-product.cfg : VENDOR PN VERSION RELEASE PRIORITY ADVICE TYPE -; from opsi-builder.cfg : CREATOR_TAG CREATOR_NAME CREATOR_EMAIL -; auto generated winst-variables -; $IconFile$: path to product picture -; -@@BUILDER_VARIABLES@@ - - -; ---------------------------------------------------------------- -; - Please edit the following values - -; ---------------------------------------------------------------- -;$ProductId$ should be the name of the product in opsi -; therefore please: only lower letters, no umlauts, -; no white space use '-' as a seperator -Set $ProductId$ = "sereby.aio" -Set $MinimumSpace$ = "400 MB" -; the path were we find the product after the installation -Set $InstallDir32$ = "%ProgramFiles32Dir%\aio" -Set $InstallDir64$ = "%ProgramFiles64Dir%\aio" -Set $LicenseRequired$ = "false" -Set $LicensePool$ = "p_" + $ProductId$ -; ---------------------------------------------------------------- - -if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) - LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError - ; Stop process and set installation status to failed -else - comment "Show product picture" - ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $ProductId$ - -; if FileExists("%ScriptPath%\delsub.ins") -; comment "Start uninstall sub section" -; Sub "%ScriptPath%\delsub.ins" -; endif - - if $LicenseRequired$ = "true" - comment "Licensing required, reserve license and get license key" - Sub_get_licensekey - endif - - comment "installing" - - if (($INST_SystemType$ = "x86 System") and ($INST_architecture$ = "system specific")) or ($INST_architecture$ = "both") or ($INST_architecture$ = "32 only") - Message "Installing " + $ProductId$ + " 32 Bit..." - - comment "Install Netframework 2.0 - 3.5 for Windows 8" - if ( $MSVersion$ = "6.2" ) and ($win8_net3.5$ = "1") and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) - if (FileExists("%ScriptPath%\X86\net3.5-win8\sources\sxs\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) - Message "Install Netframework 2.0 - 3.5 for Windows 8" - Dosbatch_install_dotNet_2-3.5_8 winst /SysNative - else - LogError "Not compatible without Netframework 3.5 for Windows 8" - isFatalError - endif - endif - - comment "Reinstall Java" - if ($java_reinstall$ = "1") - Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Dosbatch_java_reinstall - endif - - comment "Install the extracted version of the sereby packet on opsiserver" - if (($extract_install$ = "1") and not (FileExists("%ScriptPath%\X86\sereby\extracted\WinPKG.exe"))) - Message "Installing extracted " + $ProductId$ + " on depotserver..." - Dosbatch_extract_install - endif - - comment "Get connection latency between server and client" - if ($extract_use$ = "auto") - Message "Get connection latency..." - Dosbatch_get_connection_latency - Set $Output$ = getOutStreamFromSection('Dosbatch_get_connection_latency') - Set $connection_wan$ = takeFirstStringContaining($Output$, "opsi wan mode : ") - Set $connection_wan$ = TakeString(1, SplitString($connection_wan$, " : ")) - endif - - comment "Build sereby configuration" - Message "Build sereby configuration" - Dosbatch_build_config winst /SysNative - - comment "Choose version to install" - if (($extract_use$ = "1") or (($extract_use$ = "auto") and ($connection_wan$ = "1"))) - Message "Installing extracted " + $ProductId$ + " 32 Bit..." - comment "Start extracted setup program" - Dosbatch_install_extracted_32 - Sub_check_exitcode - else - Message "Installing " + $ProductId$ + " 32 Bit..." - comment "Start setup program" - Winbatch_install_32 - Sub_check_exitcode - endif - - comment "Copy files" - Files_install_32 /32Bit - comment "Patch Registry" - Registry_install /32Bit - comment "Create shortcuts" - LinkFolder_install - endif - - if ($INST_SystemType$ = "64 Bit System") and (($INST_architecture$ = "system specific") or ($INST_architecture$ = "both") or ($INST_architecture$ = "64 only")) - Message "Installing " + $ProductId$ + " 64 Bit..." - - comment "Install Netframework 2.0 - 3.5 for Windows 8" - if ( $MSVersion$ = "6.2" ) and ($win8_net3.5$ = "1") and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) - if (FileExists("%ScriptPath%\X86\net3.5-win8\sources\sxs\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) - Message "Install Netframework 2.0 - 3.5 for Windows 8" - Dosbatch_install_dotNet_2-3.5_8 winst /SysNative - else - LogError "Not compatible without Netframework 3.5 for Windows 8" - isFatalError - endif - endif - - comment "Reinstall Java" - if ($java_reinstall$ = "1") - Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Dosbatch_java_reinstall - endif - - comment "Install the extracted version of the sereby packet on opsiserver" - if (($extract_install$ = "1") and not (FileExists("%ScriptPath%\X86\sereby\extracted\WinPKG.exe"))) - Message "Installing extracted " + $ProductId$ + " on depotserver..." - Dosbatch_extract_install - endif - - comment "Get connection latency between server and client" - if ($extract_use$ = "auto") - Message "Get connection latency..." - Dosbatch_get_connection_latency - Set $Output$ = getOutStreamFromSection('Dosbatch_get_connection_latency') - Set $connection_wan$ = takeFirstStringContaining($Output$, "opsi wan mode : ") - Set $connection_wan$ = TakeString(1, SplitString($connection_wan$, " : ")) - endif - - comment "Build sereby configuration" - Message "Build sereby configuration" - Dosbatch_build_config winst /SysNative - - comment "Choose version to install" - if (($extract_use$ = "1") or (($extract_use$ = "auto") and ($connection_wan$ = "1"))) - Message "Installing extracted " + $ProductId$ + " 64 Bit..." - comment "Start extracted setup program" - Dosbatch_install_extracted_32 - Sub_check_exitcode - else - Message "Installing " + $ProductId$ + " 64 Bit..." - comment "Start setup program" - Winbatch_install_64 - Sub_check_exitcode - endif - - comment "Copy files" - Files_install_64 /64Bit - comment "Patch Registry" - Registry_install /64Bit - comment "Create shortcuts" - LinkFolder_install - endif - - comment "Reboot" - ExitWindows /Reboot - -endif - -[Dosbatch_install_dotNet_2-3.5_8] -dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\X86\net3.5-win8\sources\sxs /LimitAccess - -[Dosbatch_java_reinstall] -cscript /nologo "%ScriptPath%\X86\java\JavaUninstallScript.vbs" /keeponly - -[Dosbatch_extract_install] -@echo off &setlocal -"$Install32Exe$" -gm0 -nr -echo Ident opsi Server -echo . -for /f "tokens=2 delims=\" %%a in ('net use p:') do set "opsiservername=%%a" -echo opsi Server: %opsiservername% -@echo off -net use x: \\%opsiservername%\opt_pcbin -net use p: /delete /yes -net use p: \\%opsiservername%\opt_pcbin\install -xcopy "%SystemDrive%\AiO-Files\*.*" "%ScriptPath%\X86\sereby\extracted\" /S /E /D /Y -rd "%SystemDrive%\AiO-Files" /S /Q -net use p: /delete /yes -net use p: \\%opsiservername%\opsi_depot -net use x: /delete /yes - -[Dosbatch_get_connection_latency] -@echo off -setlocal enabledelayedexpansion -echo Ident opsi Server -echo . -for /f "tokens=2 delims=\" %%a in ('net use p:') do set "opsiservername=%%a" -echo opsi Server : %opsiservername% -for /f "tokens=4 delims='='" %%a in ('ping %opsiservername% -n 10') do set "opsiserverping=%%a" -set Latenzms=!opsiserverping:~1,10! -echo Latenz in ms : %Latenzms% -for /f "tokens=1 delims=m" %%a in ('@echo %Latenzms%') do set "Latenz=%%a" -echo Latenz : %Latenz% -if %Latenz% GTR $connection_set_max_latency$ (set wan=1) else (set wan=0) -@echo opsi wan mode : %wan% - -[Dosbatch_build_config] -copy "%ScriptPath%\X86\winpkg\WinPKG.xml" "$LogDir$" - -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/timer[@value=40]/@value" -v $timer_value$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/timer[@enabled=1]/@enabled" -v $timer_enabled$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net1.1']/@checked" -v $inst_net1.1$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net2.0']/@checked" -v $inst_net2.0$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net3.0']/@checked" -v $inst_net3.0$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net3.5']/@checked" -v $inst_net3.5$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net4.0']/@checked" -v $inst_net4.0$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='net4.5']/@checked" -v $inst_net4.5$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='msjsharp']/@checked" -v $inst_msjsharp$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='silver']/@checked" -v $inst_silver$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='jre7']/@checked" -v $inst_jre7$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='AdobeShock']/@checked" -v $inst_AdobeShock$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='basicruntimes']/@checked" -v $inst_basicruntimes$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='msdx9']/@checked" -v $inst_msdx9$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='msdxm']/@checked" -v $inst_msdxm$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='msvc']/@checked" -v $inst_msvc$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -copy "$LogDir$\WinPKG.xml" "$LogDir$\WinPKG.xml.old" -xml ed -O -u "/settings/set[@component='AdobeFlash']/@checked" -v $inst_AdobeFlash$ "$LogDir$\WinPKG.xml.old" > "$LogDir$\WinPKG.xml" -move $LogDir$\WinPKG.xml "%System%" -del $LogDir$\WinPKG.xml.old - -[Dosbatch_install_extracted_32] -@echo off -p: -cd "%ScriptPath%\X86\sereby\extracted" -"$Install_extracted_32Exe$" - -[Winbatch_install_32] -; Choose one of the following examples as basis for your installation -; You can use $LicenseKey$ var to pass a license key to the installer -; -; === Nullsoft Scriptable Install System ================================================================ -"$Install32Exe$" - -[Files_install_32] -; Example of recursively copying some files into the installation directory: -; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir32$" - -[Dosbatch_install_extracted_64] -@echo off -p: -cd "%ScriptPath%\X86\sereby\extracted" -"$Install_extracted_64Exe$" - -[Winbatch_install_64] -; Choose one of the following examples as basis for your installation -; You can use $LicenseKey$ var to pass a license key to the installer -; -; === MSI package ======================================================================================= -"$Install64Exe$" - -[Files_install_64] -; Example of recursively copying some files into the installation directory: -; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir64$" - -[Registry_install] -; Example of setting some values of an registry key: -; -; openkey [HKEY_LOCAL_MACHINE\Software\$ProductId$] -; set "name1" = "some string value" -; set "name2" = REG_DWORD:0001 -; set "name3" = REG_BINARY:00 af 99 cd - -[LinkFolder_install] -; Example of deleting a folder from AllUsers startmenu: -; -; set_basefolder common_programs -; delete_subfolder $ProductId$ -; -; Example of creating an shortcut to the installed exe in AllUsers startmenu: -; -; set_basefolder common_programs -; set_subfolder $ProductId$ -; -; set_link -; name: $ProductId$ -; target: -; parameters: -; working_dir: $InstallDir$ -; icon_file: -; icon_index: -; end_link -; -; Example of creating an shortcut to the installed exe on AllUsers desktop: -; -; set_basefolder common_desktopdirectory -; set_subfolder "" -; -; set_link -; name: $ProductId$ -; target: -; parameters: -; working_dir: $InstallDir$ -; icon_file: -; icon_index: 2 -; end_link - -[Sub_get_licensekey] -if opsiLicenseManagementEnabled - comment "License management is enabled and will be used" - - comment "Trying to get a license key" - Set $LicenseKey$ = demandLicenseKey ($LicensePool$) - ; If there is an assignment of exactly one licensepool to the product the following call is possible: - ; Set $LicenseKey$ = demandLicenseKey ("", $ProductId$) - ; - ; If there is an assignment of a license pool to a windows software id, it is possible to use: - ; DefVar $WindowsSoftwareId$ - ; $WindowsSoftwareId$ = "..." - ; Set $LicenseKey$ = demandLicenseKey ("", "", $WindowsSoftwareId$) - - DefVar $ServiceErrorClass$ - set $ServiceErrorClass$ = getLastServiceErrorClass - comment "Error class: " + $ServiceErrorClass$ - - if $ServiceErrorClass$ = "None" - comment "Everything fine, we got the license key '" + $LicenseKey$ + "'" - else - if $ServiceErrorClass$ = "LicenseConfigurationError" - LogError "Fatal: license configuration must be corrected" - LogError getLastServiceErrorMessage - isFatalError - else - if $ServiceErrorClass$ = "LicenseMissingError" - LogError "Fatal: required license is not supplied" - isFatalError - endif - endif - endif -else - LogError "Fatal: license required, but license management not enabled" - isFatalError -endif - - -[Sub_check_exitcode] -comment "Test for installation success via exit code" -set $ExitCode$ = getLastExitCode -; informations to exit codes see -; http://msdn.microsoft.com/en-us/library/aa372835(VS.85).aspx -; http://msdn.microsoft.com/en-us/library/aa368542.aspx -if ($ExitCode$ = "0") - comment "Looks good: setup program gives exitcode zero" -else - comment "Setup program gives a exitcode unequal zero: " + $ExitCode$ - if ($ExitCode$ = "1605") - comment "ERROR_UNKNOWN_PRODUCT 1605 This action is only valid for products that are currently installed." - comment "Uninstall of a not installed product failed - no problem" - else - if ($ExitCode$ = "1641") - comment "looks good: setup program gives exitcode 1641" - comment "ERROR_SUCCESS_REBOOT_INITIATED 1641 The installer has initiated a restart. This message is indicative of a success." - else - if ($ExitCode$ = "3010") - comment "looks good: setup program gives exitcode 3010" - comment "ERROR_SUCCESS_REBOOT_REQUIRED 3010 A restart is required to complete the install. This message is indicative of a success." - else - logError "Fatal: Setup program gives an unknown exitcode unequal zero: " + $ExitCode$ - isFatalError - endif - endif - endif -endif - diff --git a/CLIENT_DATA/setup3264.inc b/CLIENT_DATA/setup3264.inc deleted file mode 100644 index 4456959..0000000 --- a/CLIENT_DATA/setup3264.inc +++ /dev/null @@ -1,30 +0,0 @@ -[Dosbatch_install_dotNet_2-3.5_8] -@echo off -dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET8 /LimitAccess - -[Dosbatch_java_reinstall] -@echo off -cscript /nologo "%ScriptPath%\UnInstall\Packages\JRE\JavaUninstallScript.vbs" /keeponly - -[DosInAnIcon_install_32] -@echo off -%ScriptDrive% -cd "%ScriptPath%\Install" -inifile "$IniFile32$" [COMMON] OnceUninstallDone=false -WinPKG.exe - -[Files_install_32] -copy "$IniCfgFile$" "$InstallDir32$" -copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir32$" - -[DosInAnIcon_install_64] -@echo off -%ScriptDrive% -cd "%ScriptPath%\Install" -inifile "$IniFile64$" [COMMON] OnceUninstallDone=false -WinPKG.exe - -[Files_install_64] -copy "$IniCfgFile$" "$InstallDir64$" -copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir64$" - diff --git a/CLIENT_DATA/setup3264.ins b/CLIENT_DATA/setup3264.ins index c133b6b..0719b42 100644 --- a/CLIENT_DATA/setup3264.ins +++ b/CLIENT_DATA/setup3264.ins @@ -4,8 +4,6 @@ ; credits: http://www.opsi.org/en/credits/ [Actions] -include_append "setup3264.inc" - requiredWinstVersion >= "4.11.2.6" DefVar $UninstallProgram32$ @@ -26,25 +24,10 @@ DefVar $INST_architecture$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ -DefVar $OnceUninstallDone32$ -DefVar $OnceUninstallDone64$ Set $INST_SystemType$ = GetSystemType set $INST_architecture$ = GetProductProperty("install_architecture","system specific") -DefVar $java_reinstall$ -Set $java_reinstall$ = GetProductProperty("java_reinstall", "1") - -DefVar $MSVersion$ -Set $MSVersion$ = GetMsVersionInfo - -DefVar $dotnet2.0$ -Set $dotnet2.0$ = GetProductProperty("dotnet2.0", "install") -DefVar $dotnet3.0$ -Set $dotnet3.0$ = GetProductProperty("dotnet3.0", "install") -DefVar $dotnet3.5$ -Set $dotnet3.5$ = GetProductProperty("dotnet3.5", "install") - Set $LogDir$ = "%SystemDrive%\tmp" ; The token BUILDER_VARIABLES will be replaced by opsi-builder.sh @@ -57,21 +40,21 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; @@BUILDER_VARIABLES@@ +include_insert "define3264.inc" + ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- ;$ProductId$ should be the name of the product in opsi ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator -Set $MinimumSpace$ = "400 MB" +Set $MinimumSpace$ = "1000 MB" ; the path were we find the product after the installation Set $InstallDir32$ = "%ProgramFiles32Dir%\Sereby AIO" Set $InstallDir64$ = "%ProgramFiles64Dir%\Sereby AIO" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" -Set $IniFile32$ = $InstallDir32$ + "\opsi-" + $ProductId$ + ".ini" -Set $IniFile64$ = $InstallDir64$ + "\opsi-" + $ProductId$ + ".ini" if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ @@ -87,7 +70,7 @@ else endif if FileExists("%ScriptPath%\config3264.ins") - comment "Start uninstall sub section" + comment "Start config sub section" Sub "%ScriptPath%\config3264.ins" endif @@ -97,28 +80,21 @@ else Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 32 Bit..." comment "Start setup program" ChangeDirectory "%SCRIPTPATH%" - comment "Copy files" - Files_install_32 /32Bit - if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) - comment "Install Netframework 2.0 - 3.5 for Windows 8" + comment "Install Netframework 2.0 - 3.5 for Windows 8" if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) Message "Install Netframework 2.0 - 3.5 for Windows 8" - Dosbatch_install_dotNet_2-3.5_8 winst /SysNative + Dosbatch_install_dotNet8 winst /SysNative else LogError "Not compatible without Netframework 3.5 for Windows 8" isFatalError endif endif - - if ($java_reinstall$ = "1") - Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Dosbatch_java_reinstall - endif - - DosInAnIcon_install_32 + DosInAnIcon_install Sub_check_exitcode + comment "Copy files" + Files_install_32 /32Bit comment "Patch Registry" Registry_install /32Bit comment "Create shortcuts" @@ -129,38 +105,49 @@ else Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " 64 Bit..." comment "Start setup program" ChangeDirectory "%SCRIPTPATH%" - comment "Copy files" - Files_install_64 /64Bit - if ( $MSVersion$ = "6.2" ) and not (FileExists("%Systemroot%\Microsoft.NET\Framework\v3.5\Microsoft.Build.Tasks.v3.5.dll")) and (($dotnet3.5$ = "install") or ($dotnet3.0$ = "install") or ($dotnet2.0$ = "install")) - comment "Install Netframework 2.0 - 3.5 for Windows 8" + comment "Install Netframework 2.0 - 3.5 for Windows 8" if (FileExists("%ScriptPath%\Install\NET8\amd64_addinprocess32_b77a5c561934e089_6.2.9200.16384_none_d9d957a176ab19d8\addinprocess32.exe")) Message "Install Netframework 2.0 - 3.5 for Windows 8" - Dosbatch_install_dotNet_2-3.5_8 winst /SysNative + Dosbatch_install_dotNet8 winst /SysNative else LogError "Not compatible without Netframework 3.5 for Windows 8" isFatalError endif endif - - if ($java_reinstall$ = "1") - Message "Uninstalling " + "Java" + " 32 + 64 Bit..." - Dosbatch_java_reinstall - endif - DosInAnIcon_install_64 + DosInAnIcon_install Sub_check_exitcode + comment "Copy files" + Files_install_64 /64Bit comment "Patch Registry" Registry_install /64Bit comment "Create shortcuts" - LinkFolder_install endif - comment "Reboot" - ExitWindows /Reboot endif +[Dosbatch_install_dotNet8] +@echo off +dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET8 /LimitAccess + +[DosInAnIcon_install] +@echo off +%ScriptDrive% +cd "%ScriptPath%\Install" +WinPKG.exe + +[Files_install_32] +; copy the ini file to the InstallDir +copy "$IniCfgFile$" "$InstallDir32$" +copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir32$" + +[Files_install_64] +; copy the ini file to the InstallDir +copy "$IniCfgFile$" "$InstallDir64$" +copy -s "%ScriptPath%\Install\WinPKG.exe" "$InstallDir64$" + [Registry_install] ; Example of setting some values of an registry key: ; diff --git a/CLIENT_DATA/uninstall3264.ins b/CLIENT_DATA/uninstall3264.ins index 8f4df25..e2175bf 100644 --- a/CLIENT_DATA/uninstall3264.ins +++ b/CLIENT_DATA/uninstall3264.ins @@ -25,8 +25,6 @@ DefVar $INST_architecture$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ -DefVar $OnceUninstallDone32$ -DefVar $OnceUninstallDone64$ Set $INST_SystemType$ = GetSystemType set $INST_architecture$ = GetProductProperty("install_architecture","system specific") @@ -43,6 +41,8 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; @@BUILDER_VARIABLES@@ +include_insert "define3264.inc" + ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- @@ -52,13 +52,16 @@ Set $InstallDir64$ = "%ProgramFiles64Dir%\Sereby AIO" Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" -include_insert "control3264.ins" - comment "Show product picture" ShowBitmap "%ScriptPath%\" + $ProductId$ + ".png" $NAME$ Message "Uninstalling " + $ProductId$ + " ..." +if FileExists("%ScriptPath%\cleanup3264.ins") + comment "Start cleanup sub section" + Sub "%ScriptPath%\cleanup3264.ins" +endif + if FileExists("%ScriptPath%\delsub3264.ins") comment "Start uninstall sub section" Sub "%ScriptPath%\delsub3264.ins" diff --git a/OPSI/control b/OPSI/control index 11f0768..67001bb 100644 --- a/OPSI/control +++ b/OPSI/control @@ -17,7 +17,7 @@ setupScript: setup3264.ins uninstallScript: uninstall3264.ins updateScript: alwaysScript: -onceScript: once3264.ins +onceScript: customScript: userLoginScript: @@ -44,16 +44,7 @@ requirementType: before [ProductProperty] type: unicode -name: java_reinstall -multivalue: False -editable: False -description: Remove all versions of Java and install the latest version (from sereby packet) -values: ["0", "1"] -default: ["1"] - -[ProductProperty] -type: unicode -name: timer_value +name: sereby_timer_value multivalue: False editable: True description: Time until installation starts (0 for immediate installation) @@ -62,148 +53,155 @@ default: ["40"] [ProductProperty] type: unicode -name: timer_enabled +name: sereby_timer_enabled multivalue: False editable: False description: Timer enabled values: ["0", "1"] default: ["1"] - +[ProductProperty] +type: unicode +name: sereby_java_reinstall +multivalue: False +editable: False +description: Remove all versions of Java and install the latest version (from sereby packet) +values: ["false", "true"] +default: ["true"] [ProductProperty] type: unicode -name: dotnet1.1 +name: sereby_dotnet1.1 multivalue: False editable: False description: Install Microsoft Netframework 1.1 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: dotnet2.0 +name: sereby_dotnet2.0 multivalue: False editable: False description: Install Microsoft Netframework 2.0 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: dotnet3.0 +name: sereby_dotnet3.0 multivalue: False editable: False description: Install Microsoft Netframework 3.0 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: dotnet3.5 +name: sereby_dotnet3.5 multivalue: False editable: False description: Install Microsoft Netframework 3.5 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: dotnet4.0 +name: sereby_dotnet4.0 multivalue: False editable: False description: Install Microsoft Netframework 4.0 -values: ["install", "none"] -default: ["none"] +values: ["install", "none", "uninstall"] +default: ["none", "uninstall"] [ProductProperty] type: unicode -name: dotnet4.5 +name: sereby_dotnet4.5 multivalue: False editable: False description: Install Microsoft Netframework 4.5 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: msjsharp +name: sereby_msjsharp multivalue: False editable: False description: Install Microsoft Visual J-Sharp 2.0 SE -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: silver +name: sereby_silver multivalue: False editable: False description: Install Microsoft Silverlight 5 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: jre7 +name: sereby_jre multivalue: False editable: False -description: Install Java Runtime Environment 7 -values: ["install", "none"] +description: Install Java Runtime Environment +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: AdobeShock +name: sereby_AdobeShock multivalue: False editable: False description: Install Adobe Shockwave Player 11.6 -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: basicruntimes +name: sereby_basicruntimes multivalue: False editable: False description: Install Basic Runtimes -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: msdx9 +name: sereby_msdx9 multivalue: False editable: False description: Install Microsoft DirectX 9.0c Redistributable -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: msdxm +name: sereby_msdxm multivalue: False editable: False description: Install Microsoft DirectX for Managed Code -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: msvc +name: sereby_msvc multivalue: False editable: False description: Install Microsoft Visual C++ Runtimes -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] [ProductProperty] type: unicode -name: AdobeFlash +name: sereby_AdobeFlash multivalue: False editable: False description: Adobe Flash Player -values: ["install", "none"] +values: ["install", "none", "uninstall"] default: ["install"] @@ -211,150 +209,3 @@ default: ["install"] -[ProductProperty] -type: unicode -name: once_dotnet1.1 -multivalue: False -editable: False -description: Install Microsoft Netframework 1.1 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_dotnet2.0 -multivalue: False -editable: False -description: Install Microsoft Netframework 2.0 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_dotnet3.0 -multivalue: False -editable: False -description: Install Microsoft Netframework 3.0 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_dotnet3.5 -multivalue: False -editable: False -description: Install Microsoft Netframework 3.5 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_dotnet4.0 -multivalue: False -editable: False -description: Install Microsoft Netframework 4.0 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_dotnet4.5 -multivalue: False -editable: False -description: Install Microsoft Netframework 4.5 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_msjsharp -multivalue: False -editable: False -description: Install Microsoft Visual J-Sharp 2.0 SE -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_silver -multivalue: False -editable: False -description: Install Microsoft Silverlight 5 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_jre7 -multivalue: False -editable: False -description: Install Java Runtime Environment 7 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_AdobeShock -multivalue: False -editable: False -description: Install Adobe Shockwave Player 11.6 -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_basicruntimes -multivalue: False -editable: False -description: Install Basic Runtimes -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_msdx9 -multivalue: False -editable: False -description: Install Microsoft DirectX 9.0c Redistributable -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_msdxm -multivalue: False -editable: False -description: Install Microsoft DirectX for Managed Code -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_msvc -multivalue: False -editable: False -description: Install Microsoft Visual C++ Runtimes -values: ["none", "uninstall"] -default: ["none"] - -[ProductProperty] -type: unicode -name: once_AdobeFlash -multivalue: False -editable: False -description: Adobe Flash Player -values: ["none", "uninstall"] -default: ["none"] - - - - - - - - - - - - - diff --git a/aio-runtimes_v2.0.3.1.7z.sha1sum b/aio-runtimes_v2.0.3.1.7z.sha1sum deleted file mode 100644 index 9424c2d..0000000 --- a/aio-runtimes_v2.0.3.1.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -af12239e3e43fc9f9e53bb2827c67dbb1bad10b5 /home/mario/.opsi-dist-cache/sereby.aio-2.0.3.1/ALL/aio-runtimes_v2.0.3.1.7z diff --git a/builder-product.cfg b/builder-product.cfg index fa6b8d7..66bcb2b 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -20,34 +20,34 @@ ICON_DL_INDEX=0 ################## ### Download files and updates ################## - -## 0: Image +# +# 0: Image DL_FILE[0]="102791693_ff1cd10758.jpg" DL_SOURCE[0]="http://www.chip.de/ii/102791693_ff1cd10758.jpg" ## 1: 32 & 64 Bit Runtimes DL_FILE[1]="aio-runtimes_v${VERSION}.7z" -DL_SOURCE[1]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/60732/?download" +DL_SOURCE[1]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/61742/?download" DL_ARCH[1]="X86" DL_EXTRACT_FORMAT[1]="7zip" -DL_FILE[2]="dimpel-aio-runtimes_v${VERSION}.1.7z" -DL_SOURCE[2]="http://german-unattended.de/~dimpel/Addons/aio-runtimes_v2.0.3.7z" +DL_FILE[2]="9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO" +DL_SOURCE[2]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO" DL_ARCH[2]="X86" DL_EXTRACT_FORMAT[2]="7zip" -DL_EXTRACT_TO[2]="dimpel" +DL_EXTRACT_TO[2]="win8dotnet35" -DL_FILE[3]="9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO" -DL_SOURCE[3]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X86FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X86FREE_DE-DE_DV5.ISO" +DL_FILE[3]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO" +DL_SOURCE[3]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO" DL_ARCH[3]="X86" DL_EXTRACT_FORMAT[3]="7zip" DL_EXTRACT_TO[3]="win8dotnet35" -DL_FILE[4]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO" -DL_SOURCE[4]="http://care.dlservice.microsoft.com/dl/download/A/5/5/A55BCF48-BF3E-4D76-AC0A-2DEC2B7F5DE1/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO" +DL_FILE[4]="dimpel-aio-runtimes_v${VERSION}.7z" +DL_SOURCE[4]="http://german-unattended.de/~dimpel/Addons/aio-runtimes_v2.0.3.7z" DL_ARCH[4]="X86" DL_EXTRACT_FORMAT[4]="7zip" -DL_EXTRACT_TO[4]="win8dotnet35" +DL_EXTRACT_TO[4]="dimpel" ################## ### Uninstallers @@ -87,11 +87,3 @@ OPSI_INI_SECTION[1]="X86_64" OPSI_INI_OPTION[1]="UninstallProg64" OPSI_INI_VALUE[1]="WinPKG.exe" -################## -### set sane default for once uninstall functionality -################## - -OPSI_INI_SECTION[2]="COMMON" -OPSI_INI_OPTION[2]="OnceUninstallDone" -OPSI_INI_VALUE[2]="false" - diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 52953e3..77a0d25 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -49,9 +49,9 @@ function create() { # update parts of the sereby with the Dimple package (Dimpel just updates everything exept dotnet) # rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/JRE/* $INST_DIR/CLIENT_DATA/Install/Packages/JRE - rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash + #rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Flash/* $INST_DIR/CLIENT_DATA/Install/Packages/Flash # rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Shockwave/* $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave - rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Silverlight/* $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight + #rsync -a $INST_DIR/CLIENT_DATA/X86/Dimpel/Packages/Silverlight/* $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight # move the Windows 8 dotnet 2 - 3.5 in place mv -v $INST_DIR/CLIENT_DATA/X86/win8dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET8 diff --git a/dimpel-aio-runtimes_v2.0.3.1.1.7z.sha1sum b/dimpel-aio-runtimes_v2.0.3.1.1.7z.sha1sum deleted file mode 100644 index 09886ff..0000000 --- a/dimpel-aio-runtimes_v2.0.3.1.1.7z.sha1sum +++ /dev/null @@ -1 +0,0 @@ -8d075a36be7631960d545e68a84d7ce4987f4631 /home/mario/.opsi-dist-cache/sereby.aio-2.0.3.1/X86/dimpel-aio-runtimes_v2.0.3.1.1.7z