Integrate feature to update the Shockwave part & update schockwave to 12.0.3r133 switch back on win8 .net to enterprise package and move the source tree to the NET folder for lighter integration into winpkg add missing value to timer remove not needed rename for the java update

This commit is contained in:
Mario Fetka 2013-07-25 12:08:31 +02:00
parent f3844d2689
commit 05bf0a05cf
7 changed files with 22 additions and 12 deletions

View File

@ -0,0 +1 @@
0de8c1b561fcf52d6f0b49ac8b38191acbd337d0 /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO

View File

@ -143,7 +143,7 @@ endif
[Dosbatch_install_dotNet8] [Dosbatch_install_dotNet8]
@echo off @echo off
dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET8 /LimitAccess dism /online /enable-feature /featurename:NetFx3 /All /Source:%ScriptPath%\Install\NET\WIN8.0 /LimitAccess
[Winbatch_install] [Winbatch_install]
"%ScriptPath%\Install\opsi-WinPKG.exe" "%ScriptPath%\Install\opsi-WinPKG.exe"

View File

@ -42,7 +42,7 @@ name: sereby_timer_value
multivalue: False multivalue: False
editable: True editable: True
description: Time until installation starts (0 for immediate installation) description: Time until installation starts (0 for immediate installation)
values: ["40", "35", "30", "25", "20", "15", "10", "5" ] values: ["40", "35", "30", "25", "20", "15", "10", "5", "0" ]
default: ["5"] default: ["5"]
[ProductProperty] [ProductProperty]

View File

@ -1 +0,0 @@
d36dceb20a734905d45fcc8a29cafaeb83d8821f /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/WindowsBlue-ClientwithApps-64bit-German-X1899617.iso

View File

@ -32,8 +32,8 @@ DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/64
DL_ARCH[5]="X86" DL_ARCH[5]="X86"
DL_EXTRACT_FORMAT[5]="7zip" DL_EXTRACT_FORMAT[5]="7zip"
DL_FILE[6]="WindowsBlue-ClientwithApps-64bit-German-X1899617.iso" DL_FILE[6]="9200.16384.WIN8_RTM.120725-1247_X64FRE_ENTERPRISE_EVAL_DE-DE-HRM_CENA_X64FREE_DE-DE_DV5.ISO"
DL_SOURCE[6]="http://iso.esd.microsoft.com/W81RPI/8FBC5B738CFD9D29D6956B5DA9DF2DFD4F6C1D8AF/WindowsBlue-ClientwithApps-64bit-German-X1899617.iso" DL_SOURCE[6]="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[6]="X86" DL_ARCH[6]="X86"
DL_EXTRACT_FORMAT[6]="7zip" DL_EXTRACT_FORMAT[6]="7zip"
DL_EXTRACT_TO[6]="win8dotnet35" DL_EXTRACT_TO[6]="win8dotnet35"
@ -84,6 +84,13 @@ DL_SOURCE[12]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSI
DL_ARCH[12]="X86" DL_ARCH[12]="X86"
DL_WINST_NAME[12]=InstallFlashIeExe DL_WINST_NAME[12]=InstallFlashIeExe
SHOCKVERSION="12.0.3r133"
SHOCKUPDATE="1"
DL_FILE[11]="sw_lic_full_installer-${SHOCKVERSION}.msi"
DL_SOURCE[11]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
DL_ARCH[11]="X86"
DL_WINST_NAME[11]=InstallShockMsi
################## ##################
### Uninstallers ### Uninstallers

View File

@ -47,7 +47,7 @@ function create() {
7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/svcpack/aio-runtimes.exe 7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/svcpack/aio-runtimes.exe
# move the Windows 8 dotnet 2 - 3.5 in place # 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 mv -v $INST_DIR/CLIENT_DATA/X86/win8dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.0
# Serby and its hacks workaround (sereby pack wants to copy a file on install but thats not possible on a readonly device in opsi # Serby and its hacks workaround (sereby pack wants to copy a file on install but thats not possible on a readonly device in opsi
# move the combined x86/x64 to a common name # move the combined x86/x64 to a common name
@ -89,9 +89,6 @@ function create() {
cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe cat $INST_DIR/CLIENT_DATA/X86/7ZipSFX/7zsd_All.sfx $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z > $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.exe
rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z rm $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.exe $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z
# bug in jre install path fix
mv $INST_DIR/CLIENT_DATA/Install/Packages/JRE/_x64 $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64
# Update Java # Update Java
if [ "$JREUPDATE" = "1" ]; then if [ "$JREUPDATE" = "1" ]; then
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe
@ -100,7 +97,6 @@ function create() {
sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
fi fi
sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml sed "s!/s!/s REBOOT=Suppress!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat echo "if exist \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
@ -124,6 +120,14 @@ function create() {
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\SysWOW64\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\SysWOW64\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
# Update Shockwave
if [ "$SHOCKUPDATE" = "1" ]; then
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi
cp $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi
sed "s!..\..\..r...!${SHOCKVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
sed "s!v12!v${SHOCKVERSION//r/.}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
fi
# move the uninstallers in place (directory layout like the sereby package) # move the uninstallers in place (directory layout like the sereby package)
mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE mv -v $INST_DIR/CLIENT_DATA/X86/JavaRa $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE mv -v $INST_DIR/CLIENT_DATA/JavaUninstallScript.vbs $INST_DIR/CLIENT_DATA/UnInstall/Packages/JRE
@ -132,8 +136,6 @@ function create() {
mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash/uninstall_flash_player.exe mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Flash/uninstall_flash_player.exe
mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave mv -v $INST_DIR/CLIENT_DATA/X86/uninstall_shock_player.exe $INST_DIR/CLIENT_DATA/UnInstall/Packages/Shockwave
# move the opsi wrapper to the right dir (close the error window if nothing needs to be done) # move the opsi wrapper to the right dir (close the error window if nothing needs to be done)
mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/ mv -v $INST_DIR/CLIENT_DATA/opsi-WinPKG.exe $INST_DIR/CLIENT_DATA/Install/

View File

@ -0,0 +1 @@
d6168a4beeee97165f6aa7c5a959d7799b2edc9f /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/sw_lic_full_installer-12.0.3r133.msi