Merge branch 'java8_jre_fix_var_name' into 'master'

java8-jre: fix var name (WPKGSOFTWARE not SOFTWARE)

See merge request !53

packages/java8-jre.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <packages:packages xmlns:packages="http://www.wpkg.org/packages">
 
-  <package id="java8-jre" name="Java8 Runtime Environment" revision="%version%.1" priority="50" reboot="false">
+  <package id="java8-jre" name="Java8 Runtime Environment" revision="%version%.2" priority="50" reboot="false">
     <variable name="version" value="241" />
 
     <check type="logical" condition="and">
@@ -108,10 +108,10 @@
     <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F64180221F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
     <upgrade cmd='msiexec /qn /x {26A24AE4-039D-4CA4-87B4-2F32180221F0}'> <exit code='1603'/> <exit code='1605'/> </upgrade>
 
-    <upgrade cmd='%SOFTWARE%\java\java8\jre-8u%version%-windows-x64.exe /s WEB_JAVA=1'>
+    <upgrade cmd='%WPKGSOFTWARE%\java\java8\jre-8u%version%-windows-x64.exe /s WEB_JAVA=1'>
       <exit code='1603'/> <!-- Sigh, we just have to hope this is an "already installed" error -->
     </upgrade>
-    <upgrade cmd='%SOFTWARE%\java\java8\jre-8u%version%-windows-i586.exe /s WEB_JAVA=1'>
+    <upgrade cmd='%WPKGSOFTWARE%\java\java8\jre-8u%version%-windows-i586.exe /s WEB_JAVA=1'>
       <exit code='1603'/> <!-- Sigh, we just have to hope this is an "already installed" error -->
     </upgrade>
     <!-- Disable Auto Update -->