From c27decdfada3c7141eea9b6e0307a3a5f9dfdaa1 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Thu, 22 May 2014 22:38:50 +0200 Subject: [PATCH] coorect disable script for java v8 --- builder-targets-cb.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 51f0870..0e656da 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -361,19 +361,19 @@ function create() { echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/disable.bat - sed 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml + sed 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v7/package.xml echo "@echo off" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/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/v8/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/v8/disable.bat + echo "if exist \"%PROGRAMFILES%\Java\jre8\bin\jqs.exe\" \"%PROGRAMFILES%\Java\jre8\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat + echo "if exist \"%PROGRAMFILES(x86)%\Java\jre8\bin\jqs.exe\" \"%PROGRAMFILES(x86)%\Java\jre8\bin\jqs.exe\" -unregister" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat echo "REG DELETE HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat echo "REG DELETE HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Run /v SunJavaUpdateSched /f" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat echo "verify" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat echo "" >> $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/disable.bat - sed 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml + sed 's/.*<\/install>.*/\t\t\n&/' -i $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml tidy_xml $INST_DIR/CLIENT_DATA/Install/Packages/JRE/v8/package.xml # ==========================================================================================================