Changeset 31852 for main/trunk/gli/findjava.bat

Timestamp:

2017-08-04T19:05:08+12:00 (7 years ago)

Author:

ak19

Message:

Java code no longer works out what the ultimate URL to download from is, after all the redirects have been resolved. Wget seems to handle some of this, and for the rest, assume the user specificed URL is what the user is after

File:

• main/trunk/gli/findjava.bat (modified) (3 diffs)

main/trunk/gli/findjava.bat

@@ -46 +46 @@
     del "%TMP%\set_java_home.bat"
 
+    ::set JAVA_HOME=%GS_JAVA_HOME%
+    ::set PATH=%GS_JAVA_HOME%\bin;%PATH%
+    
 :: found java, JAVA_EXECUTABLE and GS_JAVA_HOME env vars set, can exit this script
     goto exit
@@ -65 +68 @@
     set JAVA_EXECUTABLE=%JAVA_HOME%\bin\java
     set GS_JAVA_HOME=%JAVA_HOME%
+    ::set JAVA_HOME=%GS_JAVA_HOME%
+    ::set PATH=%GS_JAVA_HOME%\bin;%PATH%
     goto exit
 
@@ -100 +105 @@
 
 endlocal & set JAVA_EXECUTABLE=%JAVA_EXECUTABLE%& set GS_JAVA_HOME=%GS_JAVA_HOME%
+::& set JAVA_HOME=%JAVA_HOME%& set PATH=%PATH%
+
+::echo ** JAVA_HOME: %JAVA_HOME%
+::echo ** PATH: %PATH%