add Windows 8.1beta support extract iso images via builder-taget-cb.sh so that the unix2dos wont work on the .net files & comment more of the code
This commit is contained in:
Mario Fetka
parent
aaf15aa062
commit
c8c30be146
|
|
@ -1,4 +1,4 @@
|
|||
<package id="AdobeAir" name="Adobe AIR 3.8.0.370" group="Standard Programme">
|
||||
<package id="AdobeAir" name="Adobe AIR v3.8.0.370" group="Standard Programme">
|
||||
<check type="file" condition="<" path="%commonprogramfiles%\Adobe AIR\Versions\1.0\Adobe AIR.dll" value="3.8.0.370" arch="x86" />
|
||||
<check type="file" condition="<" path="%programfiles(x86)%\Common Files\Adobe AIR\Versions\1.0\Adobe AIR.dll" value="3.8.0.370" arch="x64" />
|
||||
<install>
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
d36dceb20a734905d45fcc8a29cafaeb83d8821f /home/mario/.opsi-dist-cache/sereby.aio-2.0.7.1/X86/WindowsBlue-ClientwithApps-64bit-German-X1899617.iso
|
||||
|
|
@ -32,65 +32,77 @@ DL_SOURCE[5]="http://www.computerbase.de/downloads/system/all-in-one-runtimes/64
|
|||
DL_ARCH[5]="X86"
|
||||
DL_EXTRACT_FORMAT[5]="7zip"
|
||||
|
||||
# The DL_FILE[6] is also used in the builder-target-cb.sh
|
||||
# if you change also change there
|
||||
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://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_EXTRACT_FORMAT[6]="7zip"
|
||||
DL_EXTRACT_TO[6]="win8dotnet35"
|
||||
DL_WINST_NAME[6]=DotNet80Source
|
||||
|
||||
# DL_FILE[6]="dotNetFx3.5_8.7z"
|
||||
# DL_FILE[6]="dotNetFx3.5_8.0.7z"
|
||||
# DL_SOURCE[6]="file://"
|
||||
# DL_ARCH[6]="X86"
|
||||
# DL_EXTRACT_FORMAT[6]="7zip"
|
||||
# DL_EXTRACT_TO[6]="win8dotnet35"
|
||||
# DL_WINST_NAME[6]=DotNet80Source
|
||||
|
||||
# The DL_FILE[7] is also used in the builder-target-cb.sh
|
||||
# if you change also change there
|
||||
DL_FILE[7]="WindowsBlue-ClientwithApps-64bit-German-X1899617.iso"
|
||||
DL_SOURCE[7]="http://iso.esd.microsoft.com/W81RPI/8FBC5B738CFD9D29D6956B5DA9DF2DFD4F6C1D8AF/WindowsBlue-ClientwithApps-64bit-German-X1899617.iso"
|
||||
DL_ARCH[7]="X86"
|
||||
DL_WINST_NAME[7]=DotNet81Source
|
||||
|
||||
# DL_FILE[7]="dotNetFx3.5_8.1.7z"
|
||||
# DL_SOURCE[7]="file://"
|
||||
# DL_ARCH[7]="X86"
|
||||
# DL_WINST_NAME[7]=DotNet81Source
|
||||
|
||||
AIRVERSION="3.8.0.970"
|
||||
|
||||
DL_FILE[7]="air_${AIRVERSION}_win.exe"
|
||||
DL_SOURCE[7]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-8_win.exe"
|
||||
DL_ARCH[7]="X86"
|
||||
DL_WINST_NAME[7]=AdobeAirInstallExe
|
||||
|
||||
DL_FILE[8]="7zsd_extra_150_2712.7z"
|
||||
DL_SOURCE[8]="http://www.7zsfx.info/files/7zsd_extra_150_2712.7z"
|
||||
DL_FILE[8]="air_${AIRVERSION}_win.exe"
|
||||
DL_SOURCE[8]="http://labsdownload.adobe.com/pub/labs/flashruntimes/air/air3-8_win.exe"
|
||||
DL_ARCH[8]="X86"
|
||||
DL_EXTRACT_FORMAT[8]="7zip"
|
||||
DL_EXTRACT_TO[8]="7ZipSFX"
|
||||
DL_WINST_NAME[8]=AdobeAirInstallExe
|
||||
|
||||
DL_FILE[9]="7zsd_extra_150_2712.7z"
|
||||
DL_SOURCE[9]="http://www.7zsfx.info/files/7zsd_extra_150_2712.7z"
|
||||
DL_ARCH[9]="X86"
|
||||
DL_EXTRACT_FORMAT[9]="7zip"
|
||||
DL_EXTRACT_TO[9]="7ZipSFX"
|
||||
|
||||
JREUVERSION="25"
|
||||
JREVERSION="7.0.250.17"
|
||||
JREUPDATE="0"
|
||||
|
||||
DL_FILE[9]="jre7u${JREUVERSION}-x86.exe"
|
||||
DL_SOURCE[9]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79063"
|
||||
DL_ARCH[9]="X86"
|
||||
DL_WINST_NAME[9]=InstallJre32Exe
|
||||
|
||||
DL_FILE[10]="jre7u${JREUVERSION}-x64.exe"
|
||||
DL_SOURCE[10]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79065"
|
||||
DL_FILE[10]="jre7u${JREUVERSION}-x86.exe"
|
||||
DL_SOURCE[10]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79063"
|
||||
DL_ARCH[10]="X86"
|
||||
DL_WINST_NAME[10]=InstallJre64Exe
|
||||
DL_WINST_NAME[10]=InstallJre32Exe
|
||||
|
||||
DL_FILE[11]="jre7u${JREUVERSION}-x64.exe"
|
||||
DL_SOURCE[11]="http://javadl.sun.com/webapps/download/AutoDL?BundleId=79065"
|
||||
DL_ARCH[11]="X86"
|
||||
DL_WINST_NAME[11]=InstallJre64Exe
|
||||
|
||||
FLASHVERSION="11.8.800.94"
|
||||
FLASHUPDATE="1"
|
||||
|
||||
DL_FILE[11]="install_flash_player-${FLASHVERSION}.exe"
|
||||
DL_SOURCE[11]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
|
||||
DL_ARCH[11]="X86"
|
||||
DL_WINST_NAME[11]=InstallFlashExe
|
||||
|
||||
DL_FILE[12]="install_flash_player_ax-${FLASHVERSION}.exe"
|
||||
DL_SOURCE[12]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player_ax.exe"
|
||||
DL_FILE[12]="install_flash_player-${FLASHVERSION}.exe"
|
||||
DL_SOURCE[12]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player.exe"
|
||||
DL_ARCH[12]="X86"
|
||||
DL_WINST_NAME[12]=InstallFlashIeExe
|
||||
DL_WINST_NAME[12]=InstallFlashExe
|
||||
|
||||
DL_FILE[13]="install_flash_player_ax-${FLASHVERSION}.exe"
|
||||
DL_SOURCE[13]="http://fpdownload.macromedia.com/get/flashplayer/pdc/${FLASHVERSION}/install_flash_player_ax.exe"
|
||||
DL_ARCH[13]="X86"
|
||||
DL_WINST_NAME[13]=InstallFlashIeExe
|
||||
|
||||
SHOCKVERSION="12.0.3r133"
|
||||
SHOCKUPDATE="1"
|
||||
|
||||
DL_FILE[13]="sw_lic_full_installer-${SHOCKVERSION}.msi"
|
||||
DL_SOURCE[13]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
|
||||
DL_ARCH[13]="X86"
|
||||
DL_WINST_NAME[13]=InstallShockMsi
|
||||
DL_FILE[14]="sw_lic_full_installer-${SHOCKVERSION}.msi"
|
||||
DL_SOURCE[14]="http://fpdownload.macromedia.com/get/shockwave/default/english/win95nt/latest/sw_lic_full_installer.msi"
|
||||
DL_ARCH[14]="X86"
|
||||
DL_WINST_NAME[14]=InstallShockMsi
|
||||
|
||||
##################
|
||||
### Uninstallers
|
||||
|
|
|
|||
|
|
@ -46,8 +46,19 @@ function create() {
|
|||
mkdir -p $INST_DIR/CLIENT_DATA/UnInstall/Packages/{Flash,Shockwave,Silverlight}
|
||||
7z x -o$INST_DIR/CLIENT_DATA/Install $INST_DIR/CLIENT_DATA/X86/svcpack/aio-runtimes.exe
|
||||
|
||||
# extract .net 8.0 now so the unix2dos dont change the extracted files
|
||||
mkdir -p $INST_DIR/CLIENT_DATA/X86/win80dotnet35
|
||||
7z x -o$INST_DIR/CLIENT_DATA/X86/win80dotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[6]}
|
||||
|
||||
# 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/NET/WIN8.0
|
||||
mv -v $INST_DIR/CLIENT_DATA/X86/win80dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.0
|
||||
|
||||
# extract .net 8.1 now so the unix2dos dont change the extracted files
|
||||
mkdir -p $INST_DIR/CLIENT_DATA/X86/win81dotnet35
|
||||
7z x -o$INST_DIR/CLIENT_DATA/X86/win81dotnet35 $INST_DIR/CLIENT_DATA/X86/${DL_FILE[7]}
|
||||
|
||||
# move the Windows 8 dotnet 2 - 3.5 in place
|
||||
mv -v $INST_DIR/CLIENT_DATA/X86/win81dotnet35/sources/sxs $INST_DIR/CLIENT_DATA/Install/NET/WIN8.1
|
||||
|
||||
# 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
|
||||
|
|
@ -73,22 +84,45 @@ function create() {
|
|||
echo "set arch=%1" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
|
||||
echo "call %~dp0\%arch%\_Install.bat" >> $INST_DIR/CLIENT_DATA/Install/NET/3.5/_Install.bat
|
||||
|
||||
# Integrate .net for win8.0 into winpkg
|
||||
# Integrate .net for win 8.0 into winpkg
|
||||
for NETVER in 2.0 3.0 3.5
|
||||
do
|
||||
# convert all the cmd's to axept check entities
|
||||
sed '/_Install.bat/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
sed '/NET Framework/ s/\/>/>\n\t\t<\/cmd>/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
# force a check on os verison for every cmd command
|
||||
sed 's/.*\t<\/cmd>.*/\t\t<check type="os" condition="<" value="6.2.9200.0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
# remove the installer and package end tags
|
||||
sed -e '/^\t<\/install>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
sed -e '/^<\/package>/d' -i $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
# append the win 8.0 install cmd via a cmd script that runns it
|
||||
echo "<cmd path=\"_Install80.bat\" >" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "<check type=\"os\" condition=\">=\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "<check type=\"os\" condition=\">\" value=\"6.2.9200.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "<check type=\"os\" condition=\"<\" value=\"6.3.9400.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "</cmd>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
|
||||
# append the win 8.1 install cmd via a cmd script that runns it
|
||||
echo "<cmd path=\"_Install81.bat\" >" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "<check type=\"os\" condition=\">\" value=\"6.3.9400.0\" />" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "</cmd>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
|
||||
# add back the install and package end tags
|
||||
echo "</install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
echo "</package>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||
|
||||
# create the needed install cmd script for win 8.0
|
||||
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
|
||||
echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%~dp0\..\WIN8.0 /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
|
||||
echo "SET NETDIR=%~dp0" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
|
||||
echo "cd %NETDIR%\.." >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
|
||||
echo "SET NETPARENTDIR=%cd%" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
|
||||
echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.0 /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install80.bat
|
||||
|
||||
# create the needed install cmd script for win 8.1
|
||||
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install81.bat
|
||||
echo "SET NETDIR=%~dp0" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install81.bat
|
||||
echo "cd %NETDIR%\.." >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install81.bat
|
||||
echo "SET NETPARENTDIR=%cd%" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install81.bat
|
||||
echo "dism /online /enable-feature /featurename:NetFx3 /All /Source:%NETPARENTDIR%\WIN8.1 /LimitAccess" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install81.bat
|
||||
|
||||
done
|
||||
|
||||
# sed everything to disabled
|
||||
|
|
@ -103,6 +137,8 @@ function create() {
|
|||
mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
|
||||
sed 's/.*<\/settings>.*/\t<set component="AdobeAir" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||
sed "s!.\..\..\....!${AIRVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
|
||||
|
||||
# Adobe AIR Installer not working very good from network share so create a sfx file that places the installer into a temp and let it run locally
|
||||
7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-8_win.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
|
||||
|
|
|
|||
Loading…
Reference in New Issue