tidy the package.xml files
This commit is contained in:
parent
3c43fd46f5
commit
7899ee3a5c
@ -125,6 +125,7 @@ function create() {
|
|||||||
# add back the install and package end tags
|
# add back the install and package end tags
|
||||||
echo "</install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
echo "</install>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||||
echo "</package>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
echo "</package>" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||||
|
tidy_xml $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/package.xml
|
||||||
|
|
||||||
# create the needed install cmd script for win 8.x
|
# create the needed install cmd script for win 8.x
|
||||||
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
|
echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/NET/$NETVER/_Install8X.bat
|
||||||
@ -176,7 +177,6 @@ function create() {
|
|||||||
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
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
@ -207,7 +207,6 @@ function create() {
|
|||||||
patch_package_xml $INST_DIR/CLIENT_DATA/Install/Packages/Shockwave/package.xml "/package[@id='AdobeShock']/@name" "Adobe Shockwave Player v${SHOCKVERSION}"
|
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
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
@ -267,7 +266,6 @@ function create() {
|
|||||||
mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
|
mv -v $INST_DIR/CLIENT_DATA/X86/MSVC $INST_DIR/CLIENT_DATA/Install/Packages/MSVC
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
# move the uninstallers in place (directory layout like the sereby package)
|
# move the uninstallers in place (directory layout like the sereby package)
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
@ -289,6 +287,7 @@ function create() {
|
|||||||
# Correct linefeed in config
|
# Correct linefeed in config
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
|
|
||||||
|
tidy_xml $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||||
unix2dos $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
unix2dos $INST_DIR/CLIENT_DATA/Config/WinPKG.xml
|
||||||
|
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
@ -350,6 +349,7 @@ function create() {
|
|||||||
# 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/.*<\/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
|
||||||
|
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/package.xml
|
||||||
|
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
# Disable Flash Update Check
|
# Disable Flash Update Check
|
||||||
@ -357,13 +357,14 @@ function create() {
|
|||||||
|
|
||||||
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/.*<\/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/.*<\/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
|
||||||
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
|
||||||
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
|
echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/Flash/disable64.bat
|
||||||
|
tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/Flash/package.xml
|
||||||
|
|
||||||
# ==========================================================================================================
|
# ==========================================================================================================
|
||||||
# Posthooks: change linefeed, Set exec bit, delete temp
|
# Posthooks: change linefeed, Set exec bit, delete temp
|
||||||
|
Loading…
Reference in New Issue
Block a user