texlua wrappers for scripts: updated.

git-svn-id: svn://tug.org/texlive/trunk@7266 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 17 deletions

diff --git a/Master/bin/win32/getnonfreefonts.texlua b/Master/bin/win32/getnonfreefonts.texlua
index 33a2d8cc1c4..ddf32fbd1e7 100755
--- a/Master/bin/win32/getnonfreefonts.texlua
+++ b/Master/bin/win32/getnonfreefonts.texlua
@@ -41,6 +41,8 @@ kpse.set_program_name(filename, basename)
 TEXDIR=kpse.var_value('SELFAUTOPARENT')
 BINDIR=kpse.var_value('SELFAUTOLOC')
 
+perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
+
 os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
 os.setenv('GS_LIB', TEXDIR..'/tlpkg/tlgs/lib')
 os.setenv('PATH', TEXDIR..'/tlpkg/tlgs/bin;'..os.getenv('PATH'))
@@ -55,29 +57,15 @@ if sys and lfs.isfile(BINDIR..'/'..basename..'.exe') then
    command={BINDIR..'/'..basename..'.exe'}
 elseif lfs.isfile(BINDIR..'/'..basename..'-bin.exe') then
    command={BINDIR..'/'..basename..'-bin.exe'}
-elseif lfs.isdir(BINDIR..'/'..basename..'.pl') then
-   perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
+elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
    script=BINDIR..'/'..basename..'.pl'
    command={perlbin, script}
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
-   perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
-elseif kpse.find_file(basename..'.rb', 'texmfscripts') then
-   script=kpse.find_file(basename..'.rb', 'texmfscripts')
-   command={'ruby', script}
-elseif kpse.find_file(basename..'.py', 'texmfscripts') then
-   script=kpse.find_file(basename..'.py', 'texmfscripts')
-   command={'python', script}
-elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then  
-   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
-   command={'texlua', script}
-elseif kpse.find_file(basename..'.lua', 'texmfscripts') then  
-   script=kpse.find_file(basename..'.lua', 'texmfscripts')
-   command={'texlua', script}
 else
-   os.stderr:write(filename..'.texlua: No interpreter found for '..
-		   basename..'\n') 
+   io.stderr:write(filename..'.texlua: '..basename..
+		   ': No appropriate script found.\n') 
 end
 
 for i=1, #arg do
@@ -86,5 +74,12 @@ end
 
 command=fixwin(command)
 
+--[[ Prepend an additional hyphen to activate this code.
+for i=0, #command do
+   print (command[i])
+end
+os.exit(ret)
+--]]
+
 ret=os.spawn(command)
 os.exit(ret)