From 10a7fca9ba2b1a1096e2ffd2a7063af5a4917bc1 Mon Sep 17 00:00:00 2001 From: Reinhard Kotucha Date: Mon, 31 Mar 2008 19:15:48 +0000 Subject: texlua wrappers for scripts: updated. git-svn-id: svn://tug.org/texlive/trunk@7266 c570f23f-e606-0410-a88d-b1316a301751 --- Master/bin/win32/epstopdf.texlua | 29 +++++++++++---------------- Master/bin/win32/getnonfreefonts-sys.texlua | 29 +++++++++++---------------- Master/bin/win32/getnonfreefonts.texlua | 29 +++++++++++---------------- Master/bin/win32/pdfthumb.texlua | 1 - Master/bin/win32/texdoctk.texlua | 29 +++++++++++---------------- Master/bin/win32/thumbpdf.texlua | 29 +++++++++++---------------- Master/bin/win32/tl-package-manager.texlua | 31 ++++++++++++----------------- Master/bin/win32/updmap-sys.texlua | 29 +++++++++++---------------- Master/bin/win32/updmap.texlua | 29 +++++++++++---------------- 9 files changed, 97 insertions(+), 138 deletions(-) mode change 100644 => 100755 Master/bin/win32/pdfthumb.texlua (limited to 'Master/bin/win32') diff --git a/Master/bin/win32/epstopdf.texlua b/Master/bin/win32/epstopdf.texlua index 33a2d8cc1c4..ddf32fbd1e7 100755 --- a/Master/bin/win32/epstopdf.texlua +++ b/Master/bin/win32/epstopdf.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) diff --git a/Master/bin/win32/getnonfreefonts-sys.texlua b/Master/bin/win32/getnonfreefonts-sys.texlua index 33a2d8cc1c4..ddf32fbd1e7 100755 --- a/Master/bin/win32/getnonfreefonts-sys.texlua +++ b/Master/bin/win32/getnonfreefonts-sys.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) 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) diff --git a/Master/bin/win32/pdfthumb.texlua b/Master/bin/win32/pdfthumb.texlua old mode 100644 new mode 100755 index 383e741e189..5d524a0a66d --- a/Master/bin/win32/pdfthumb.texlua +++ b/Master/bin/win32/pdfthumb.texlua @@ -41,4 +41,3 @@ os.exit(ret) ret=os.spawn(command) os.exit(ret) -ft \ No newline at end of file diff --git a/Master/bin/win32/texdoctk.texlua b/Master/bin/win32/texdoctk.texlua index 33a2d8cc1c4..ddf32fbd1e7 100755 --- a/Master/bin/win32/texdoctk.texlua +++ b/Master/bin/win32/texdoctk.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) diff --git a/Master/bin/win32/thumbpdf.texlua b/Master/bin/win32/thumbpdf.texlua index 33a2d8cc1c4..ddf32fbd1e7 100755 --- a/Master/bin/win32/thumbpdf.texlua +++ b/Master/bin/win32/thumbpdf.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) diff --git a/Master/bin/win32/tl-package-manager.texlua b/Master/bin/win32/tl-package-manager.texlua index ee2edadb197..c808e94b5a9 100755 --- a/Master/bin/win32/tl-package-manager.texlua +++ b/Master/bin/win32/tl-package-manager.texlua @@ -1,6 +1,6 @@ #! /usr/bin/env texlua --*-Lua-*- --- $Id: tl-package-manager.texlua 6943 2008-03-11 21:38:19Z reinhardk $ +-- $Id: fmtutil-sys.texlua 7030 2008-03-19 21:52:43Z reinhardk $ -- Copyright (C) 2007 Reinhard Kotucha, Norbert Preining. -- You may freely use, modify and/or distribute this file. @@ -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) diff --git a/Master/bin/win32/updmap-sys.texlua b/Master/bin/win32/updmap-sys.texlua index 33a2d8cc1c4..ddf32fbd1e7 100755 --- a/Master/bin/win32/updmap-sys.texlua +++ b/Master/bin/win32/updmap-sys.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) diff --git a/Master/bin/win32/updmap.texlua b/Master/bin/win32/updmap.texlua index 33a2d8cc1c4..ddf32fbd1e7 100755 --- a/Master/bin/win32/updmap.texlua +++ b/Master/bin/win32/updmap.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) -- cgit v1.2.3