|
|
@ -45,6 +45,28 @@ write_svcpack_file() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
patch_package_xml() {
|
|
|
|
|
|
|
|
local xml_file=$1
|
|
|
|
|
|
|
|
local xml_path=$2
|
|
|
|
|
|
|
|
local xml_value=$3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
mv ${xml_file} ${xml_file}.old
|
|
|
|
|
|
|
|
cat ${xml_file}.old | tidy -utf8 -xml -w 255 -i -c -q -asxml | xmlstarlet ed -O -u "${xml_path}" -v "${xml_value}" | sed -e 's!>!>!g' -e 's!<!<!g' > ${xml_file}
|
|
|
|
|
|
|
|
rm ${xml_file}.old
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
tidy_xml() {
|
|
|
|
|
|
|
|
local xml_file=$1
|
|
|
|
|
|
|
|
local xml_path=$2
|
|
|
|
|
|
|
|
local xml_value=$3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
echo ${xml_file}
|
|
|
|
|
|
|
|
mv ${xml_file} ${xml_file}.old
|
|
|
|
|
|
|
|
cat ${xml_file}.old | tidy -utf8 -xml -w 255 -i -c -q -asxml | sed -e 's!>!>!g' -e 's!<!<!g' > ${xml_file}
|
|
|
|
|
|
|
|
rm ${xml_file}.old
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
function create() {
|
|
|
|
function create() {
|
|
|
|
echo "Create"
|
|
|
|
echo "Create"
|
|
|
|
builder_create
|
|
|
|
builder_create
|
|
|
@ -131,7 +153,10 @@ function create() {
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/AdobeAIR_7zip_config.txt $INST_DIR/CLIENT_DATA/Install/Packages/Air/7zip_config.txt
|
|
|
|
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/.*<\/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
|
|
|
|
|
|
|
|
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml "/package/check[@type='file']/@value" "${AIRVERSION}"
|
|
|
|
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Air/package.xml "/package[@id='AdobeAir']/@name" "Adobe AIR v${AIRVERSION}"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
# 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-9_win.exe
|
|
|
|
7z a $INST_DIR/CLIENT_DATA/Install/Packages/Air/AdobeAIR.7z $INST_DIR/CLIENT_DATA/Install/Packages/Air/air3-9_win.exe
|
|
|
@ -146,11 +171,12 @@ function create() {
|
|
|
|
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe
|
|
|
|
rm -rf $INST_DIR/CLIENT_DATA/Install/Packages/JRE/*/jre.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x86.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x86/jre.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/jre7u${JREUVERSION}-x64.exe $INST_DIR/CLIENT_DATA/Install/Packages/JRE/x64/jre.exe
|
|
|
|
sed "s!Update ..!Update ${JREUVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml "/package/variable[@name='NAME']/@value" "Java Runtime Environment 7 Update ${JREUVERSION}"
|
|
|
|
sed "s!.\..\....\...!${JREVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml "/package/variable[@name='BUILD']/@value" "${JREVERSION}"
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
|
# Update Flash
|
|
|
|
# Update Flash
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
@ -158,9 +184,10 @@ function create() {
|
|
|
|
if [ "$FLASHUPDATE" = "1" ]; then
|
|
|
|
if [ "$FLASHUPDATE" = "1" ]; then
|
|
|
|
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe
|
|
|
|
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Flash/*.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/install_flash_player-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/install_flash_player_ax-${FLASHAXVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Flash/install_flash_player_ax.exe
|
|
|
|
sed "s!..\..\....\....!${FLASHVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml "/package/variable[@name='VERSION']/@value" "${FLASHVERSION}"
|
|
|
|
sed "s!.._._..._...!${FLASHVERSION//./_}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml "/package/variable[@name='VERSION_FILE']/@value" "${FLASHVERSION//./_}"
|
|
|
|
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml "/package/variable[@name='VERSION_FILE_AX']/@value" "${FLASHAXVERSION//./_}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
# sed force update on flash
|
|
|
|
# sed force update on flash
|
|
|
|
sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
sed -e "s!-install!-force -install!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
@ -169,13 +196,18 @@ function create() {
|
|
|
|
# Update Shockwave
|
|
|
|
# Update Shockwave
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
sed 's!<install>!<install>' -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
|
|
|
|
|
|
|
|
sed 's/.*<install>.*/\t<variable name="VERSION_FILE" value="1204144" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
|
|
|
|
|
|
|
|
sed "s!SwHelper_.*\.exe!SwHelper_%VERSION_FILE%.exe!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
|
|
|
|
|
|
|
|
|
|
|
|
if [ "$SHOCKUPDATE" = "1" ]; then
|
|
|
|
if [ "$SHOCKUPDATE" = "1" ]; then
|
|
|
|
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi
|
|
|
|
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/*.msi
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/sw_lic_full_installer-${SHOCKVERSION}.msi $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/sw_lic_full_installer.msi
|
|
|
|
mv $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
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package/variable[@name='VERSION_FILE']/@value" "${SHOCKVERSION//./}"
|
|
|
|
sed "s!v12!v${SHOCKVERSION//r/.}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package[@id='AdobeShock']/@name" "Adobe Shockwave Player v${SHOCKVERSION}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
|
# Update Silverlight
|
|
|
|
# Update Silverlight
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
@ -184,8 +216,8 @@ function create() {
|
|
|
|
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/*.exe
|
|
|
|
rm -f $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/*.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/Silverlight-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe
|
|
|
|
mv $INST_DIR/CLIENT_DATA/X86/Silverlight_x64-${SILVERVERSION}.exe $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/Silverlight_x64.exe
|
|
|
|
sed "s!.\..\......\..!${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml "/package/variable[@name='NAME']/@value" "Microsoft Silverlight v${SILVERVERSION}"
|
|
|
|
sed "s!v5!v${SILVERVERSION}!" -i $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml
|
|
|
|
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Silverlight/package.xml "/package/variable[@name='VERSION']/@value" "${SILVERVERSION}"
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
@ -204,7 +236,6 @@ function create() {
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_FS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/package.xml
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/Ricktendo_FS_package.xml $INST_DIR/CLIENT_DATA/Install/Packages/fsredist/package.xml
|
|
|
|
sed 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
|
|
|
sed 's/.*<\/settings>.*/\t<set component="msfsharp" checked="0" \/>\n&/' -i $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
|
# Update .NET 4.0 & 4.5 with Ricktendo
|
|
|
|
# Update .NET 4.0 & 4.5 with Ricktendo
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
@ -318,15 +349,15 @@ function create() {
|
|
|
|
echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
|
|
|
|
echo "if exist \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre7\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
|
|
|
|
# echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
|
|
|
|
# echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
|
|
|
|
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
|
|
|
|
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/disable.bat
|
|
|
|
sed 's/.*\t<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
|
|
|
|
sed 's/.*<\/install>.*/\t\t<cmd path="disable.bat" name="Disable Java Update Check " \/>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
|
|
|
|
|
|
|
|
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
|
# Disable Flash Update Check
|
|
|
|
# Disable Flash Update Check
|
|
|
|
# ==========================================================================================================
|
|
|
|
# ==========================================================================================================
|
|
|
|
|
|
|
|
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg
|
|
|
|
mv -v $INST_DIR/CLIENT_DATA/AdobeFlash_mms.cfg $INST_DIR/CLIENT_DATA/Install/Packages/Flash/mms.cfg
|
|
|
|
sed 's/.*\t<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" >\n<check type="file" condition="notexist" path="%Windir%\\system32\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
sed 's/.*<\/install>.*/\t\t<cmd path="disable32.bat" name="Disable Flash Update Check x86" >\n<check type="file" condition="notexist" path="%Windir%\\system32\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
sed 's/.*\t<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" \/>\n<check type="file" condition="notexist" path="%Windir%\\SysWOW64\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x64" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
sed 's/.*<\/install>.*/\t\t<cmd path="disable64.bat" name="Disable Flash Update Check x64" arch="x64" \/>\n<check type="file" condition="notexist" path="%Windir%\\SysWOW64\\Macromed\\Flash\\NPSWF32_%VERSION_FILE%.dll" arch="x64" \/>\n<\/cmd>\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
|
|
|
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
|
|
|
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
|
|
|
echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\system32\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
|
|
|
echo "copy /y /v \"%~dp0mms.cfg\" \"%WINDIR%\system32\Macromed\Flash\mms.cfg\"" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
|
|
|
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
|
|
|
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable32.bat
|
|
|
|