Changeset 32420 for main/trunk/greenstone2

Timestamp:

2018-09-03T16:30:26+12:00 (6 years ago)

Author:

ak19

Message:

Improved way of finding OS bitness from bat, even though currently unused

File:

• main/trunk/greenstone2/setup.bat (modified) (2 diffs)

main/trunk/greenstone2/setup.bat

@@ -254 +254 @@
 ::   containing "PROCESSOR_ARCHITECTURE", splits this line on the delimiter "=" and stores the 2nd token in %%G
 ::   Based on the example "_ping_cmd" at https://ss64.com/nt/for_cmd.html
-REM for /f "tokens=2 delims==" %%G in ('set Processor ^|find "PROCESSOR_ARCHITECTURE"') do set BITNESS=%%G
+:: REM for /f "tokens=2 delims==" %%G in ('set Processor ^|find "PROCESSOR_ARCHITECTURE"') do set BITNESS=%%G
+:: Easier way to above: %PROCESSOR_ARCHITECTURE% already contains a value of amd64/x64 or x86. So don't need to run the "set Processor"
+:: command and hunt for PROCESSOR_ARCHITECTURE line. See https://superuser.com/questions/321988/how-do-i-determine-if-my-windows-is-32-bit-or-64-bit-using-a-command
+REM set BITNESS=%PROCESSOR_ARCHITECTURE%
 ::   BITNESS will now be "x86" for 32 bit or something like "amd64" or "x64" for 64 bit
 :: From https://ss64.com/nt/syntax-substring.html
@@ -261 +264 @@
 REM if /i "%BITNESS:64=%" == "%BITNESS%" (set BITNESS=32) else (set BITNESS=64)
 
+
 popd
 endlocal & set PATH=%PATH%& set GSDLHOME=%GSDLHOME%& set GSDLOS=%GSDLOS%& set JRE_HOME=%JRE_HOME%& set JAVA_HOME=%JAVA_HOME%