texlive[47328] Build/source/texk/texlive/w32_wrapper/runscript.tlu:

[commits+kakuto at tug.org]

Revision: 47328
          http://tug.org/svn/texlive?view=revision&revision=47328
Author:   kakuto
Date:     2018-04-06 23:09:50 +0200 (Fri, 06 Apr 2018)
Log Message:
-----------
sync

Modified Paths:
--------------
    trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu

Modified: trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu
===================================================================
--- trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu	2018-04-06 21:07:13 UTC (rev 47327)
+++ trunk/Build/source/texk/texlive/w32_wrapper/runscript.tlu	2018-04-06 21:09:50 UTC (rev 47328)
@@ -1,7 +1,7 @@
 
 
-local svnrevision = string.match("$Revision: 46945 $", "%d+") or "0"
-local svndate     = string.match("$Date: 2018-03-13 14:42:02 +0900 (火, 13 3 2018) $", "[-%d]+") or "2009-12-04"
+local svnrevision = string.match("$Revision: 47327 $", "%d+") or "0"
+local svndate     = string.match("$Date: 2018-04-07 06:07:13 +0900 (土, 07 4 2018) $", "[-%d]+") or "2009-12-04"
 local bannerstr   = "runscript wrapper utility (rev. " ..
                     svnrevision .. ", " .. svndate .. ")\n" .. 
                     "usage:   runscript script-name [arguments]\n" ..
@@ -264,6 +264,9 @@
           use sys_user_progs instead, add kanji-config-updmap
     2018/03/12
         - introduce a new function gettexmfdist() for security.
+    2018/04/06
+        - introduce a new function is_64bit_windows_os() to
+          check Windows OS.
 ]]
 
 -- HELPER SUBROUTINES --
@@ -426,6 +429,28 @@
   return str
 end
 
+--
+-- Is the Windows OS 64bit?
+--
+local function is_64bit_windows_os()
+  local return_val = false
+  -- 32 bit binaries always work, thus the default is false
+  local architecture = os.getenv('PROCESSOR_ARCHITECTURE')
+  if architecture ~= nil then
+    if architecture == 'x86' then
+      local is_wow64 = os.getenv('PROCESSOR_ARCHITEW6432')
+      if is_wow64 == nil then
+        return_val = false
+      else
+        return_val = true
+      end
+    else
+      return_val = true
+    end
+  end
+  return return_val
+end
+
 -- MAIN_CHUNK -- encapsulated in a function for more robust execution with pcall
 
 local function MAIN_CHUNK()
@@ -671,7 +696,11 @@
 elseif progname == 'asy' then
   os.setenv('ASYMPTOTE_GS', GSEXE)
   os.setenv('CYGWIN', 'nodosfilewarning')
-  ARGV = {[0]=TEXDIR..'/tlpkg/asymptote/asy.exe', 'asy'}
+  if is_64bit_windows_os() then
+    ARGV = {[0]=TEXDIR..'/tlpkg/asymptote64/asy.exe', 'asy'}
+  else
+    ARGV = {[0]=TEXDIR..'/tlpkg/asymptote/asy.exe', 'asy'}
+  end
 elseif progname == 'dviout' then
   local fontsdir = kpse.var_value('TEXMFVAR') .. '/fonts'
   if (lfs.attributes(fontsdir, 'mode') ~= 'directory') then