Commit 207494e8 authored by CompileNix's avatar CompileNix
Browse files

Merge branch 'java8' into 'master'

Ignoring Error on javapath folder creation

See merge request Compilenix/opsi-java!2
parents 50e8251a b52dc533
......@@ -159,6 +159,10 @@ SleepSeconds 3
Message "All applications killed, which could use Java"
ExitOnError = False
WinBatch_create_javapath
ExitOnError = True
; #############################################################################################################################################
; ################################################################### Install x64 #############################################################
; #############################################################################################################################################
......@@ -172,7 +176,9 @@ If $ProcessorArchitecture$ = "64 Bit System"
SetLogLevel = 1
Sub "%ScriptPath%\check_msi-exitcode.ins"
SetLogLevel = 6
ExitOnError = False
Files_add_symlinks_in_javapath_x64
ExitOnError = True
Set $Updated_javapath$ = "True"
SetLogLevel = 1
Else
......@@ -194,7 +200,9 @@ If $ProcessorArchitecture$ = "64 Bit System"
SetLogLevel = 1
If $Updated_javapath$ = "False"
SetLogLevel = 6
ExitOnError = False
Files_add_symlinks_in_javapath_x86
ExitOnError = True
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
......@@ -226,7 +234,9 @@ If $ProcessorArchitecture$ = "64 Bit System"
Sub "%ScriptPath%\check_msi-exitcode.ins"
If $Updated_javapath$ = "False"
SetLogLevel = 6
ExitOnError = False
Files_add_symlinks_in_javapath_x86
ExitOnError = True
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
......@@ -246,7 +256,9 @@ If $ProcessorArchitecture$ = "64 Bit System"
Sub "%ScriptPath%\check_msi-exitcode.ins"
If $Updated_javapath$ = "False"
SetLogLevel = 6
ExitOnError = False
Files_add_symlinks_in_javapath_x86
ExitOnError = True
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
......@@ -280,7 +292,9 @@ If $ProcessorArchitecture$ = "x86 System" And $ProductProperty_64bitOnly$ = "Fal
Sub "%ScriptPath%\check_msi-exitcode.ins"
If $Updated_javapath$ = "False"
SetLogLevel = 6
ExitOnError = False
Files_add_symlinks_in_javapath_x86
ExitOnError = True
Set $Updated_javapath$ = "True"
SetLogLevel = 1
EndIf
......@@ -333,6 +347,9 @@ Else
EndIf
[WinBatch_create_javapath]
mkdir "C:\ProgramData\Oracle\Java\javapath"
[Files_add_symlinks_in_javapath_x64]
symlink "%ProgramFiles64Dir%\Java\jre$ProductVersion$\bin\java.exe" C:\ProgramData\Oracle\Java\javapath\java.exe
symlink "%ProgramFiles64Dir%\Java\jre$ProductVersion$\bin\javaw.exe" C:\ProgramData\Oracle\Java\javapath\javaw.exe
......
......@@ -2,7 +2,7 @@ e004dc7ef4fd650ffb13a0129dceacf812bbffd3d357dce2c215c9253c4f57c0 *CLIENT_DATA/ch
95505eda482216d0e1005b8d9604e75e92b796b33b5ad7c94fea3ea07cdff1a0 *CLIENT_DATA/check_uninstall.ins
00c5f00e111e6c0b69fd95984b84f3a4a56d3959fe5058f2129797833704a4b2 *CLIENT_DATA/delsub.ins
8484c13e3bc3ef3034ca2bd98ca8be7b0e3b14ce1a9a64c8720c5cb63acc09ea *CLIENT_DATA/java.png
0f43c0e01202544b9c7fbefd2691db655424cfe0a041330d221a60683bacceae *CLIENT_DATA/setup.ins
653c0c64c44ca4cf1262703b304ed2b4e1681e67b31a1d0a02412929ada41db9 *CLIENT_DATA/setup.ins
fa5de8068571d40f01d6ce8040761b63b5e805aca584e8904cfd026c3fd09138 *CLIENT_DATA/setup_data/jdk-8u171-windows-i586.exe
841b20e904b7f46fe7c8ce88bd35148e9663c750c8336286d0eb05a0a5b203f4 *CLIENT_DATA/setup_data/jdk-8u171-windows-x64.exe
63c66282303df19060b476b583f8bc21a88afcf63f669d56c4e966751ec9181c *CLIENT_DATA/setup_data/jdk-8u172-windows-i586.exe
......
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
iQIcBAABCAAGBQJa2FmpAAoJEBC2Zm7nY2M9Qr0QAK3xzlrf4n2kG+m1fZ/wdecA
zIEWfrecxyvAWfU6b20O4Hz/KTrTWY7vyRZHKeoehIzrHhzt64GO+tAvqxRvdx+l
Gy3EJ8zCWQ/9XPoqRnwgcYA2SZ4VADDm7lKzfoxFL0HhONb3urC2BKdhSt2v4+og
7NASibulCVL9umIqjQEN+yAQ6FIN2M1J5jkWfkRO5obWfKXioEEUhBZ5zDx8MVYb
nieXGhSsFGKODjIkjdioCaysydoth9zcWAAV8xMp+T63HuL7jWNS54ZhzH6NyI2c
YzeB3K2KcHVXiXZDvozuLidBOLc0Cuu4g6xBNmvGVi7iUBDTyQ7xmF3GoW9p6Y9g
KLNZQFFsJm1Lmpt6vaWMXkiLpp0nhj7s/aVJGw/EBPy7X4GNHIqi7C5SaVSMK5c1
G2Bnmn/nf6eusJgT9RDe8MbYBhfINwPdS6RgCirRnvfvVB/X8ok1BYKG6V/dYbDP
r2JER9OycD24K/g8XcPkVvpQyDlg9hxKyYe+LemM61UPs2CeUlSL4TlE2IT0BQnm
Q0FmAzJbq19+bddSzI/ZFcctNDgdQnDaBUwDc410LVgBuz6vbl05x7RjxdOyzcIv
SGSOXUPgWLL/Ax6EBRMohwuJ8gGYII74aBvM7soul5E8zQ/PZNKgwdoC8+tGucii
Mqr1bykwi7avF30aKVh1
=UBBw
iQIcBAABCAAGBQJa2bpbAAoJEBC2Zm7nY2M9sJwQAIYJLVjVBwrffe2X2LcmO/LC
HzlHaWsi4BlDxT6u2gFo8OMtI5ao+ZaELIFbl/M+vz7ao5Z6bDTmXmoukKw/Z5vW
yqT+tx1hU+utureoOruXdDDvhcmSDRADwwyxiBbGBXWx6o/+SiWDdLgFdSoAfLVX
FdKM0LnWq3/f2IljTUWx2elYpxFTPYp+4beEK+t2Z+NtuQ1UO42WTte0iw4Ph8AZ
hZ7LEnypNnzN2YYvd18NMUJANKUXmiogN2ShQtv2/o7MzrO0vNXMyduY4WxSo3vn
9yn9QegZprez3buGnimlJKAeaif0UkWRzuExpqV8riII5K+JBoxoiBQXq14coiZ6
M05QZcM3nA62QpvB/474Utyu6MRHGYXccbb3JxsvflaxDcsI/pp8G4um2UQ3MR1y
v7Gu0myoHBcgjo8uWvXD3J7IT88XOnNmo0676jbEiV8BNtUJsbe3mzWUtWsuA/li
IcEazs/NTlb+zAAyy+InwDxC9rhyTFpka6xMn1ObSEko1Soe4CyK9Od1aFONtlKN
BeocamGzF7G04g1HH1qHKG51jSxB4Jzko8wtv90t1ZpO80gVUeDF1qks56jGWjIW
dD/i9+YhmpriIhHyWoUkT+LuhibeP7hQPCudOWNdvTuLdN3rBaMiYLdQq+fO+6hL
G5etMS7rGFfZuJxrRSnR
=zEJH
-----END PGP SIGNATURE-----
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment