summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-04-23 07:57:37 +0000
committerNorbert Preining <preining@logic.at>2008-04-23 07:57:37 +0000
commitff82f9927d769fb056727173831e17ec166747ca (patch)
treec6eda1aead753e4d717c50857e7d76a132216348 /Master
parentb5119b037e59fea7f92a8c556c6ad77e2e9935b2 (diff)
allow calling texconf --prog tlmgr ...
so that error messages and usage contain the --prog argument git-svn-id: svn://tug.org/texlive/trunk@7613 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/texmf/scripts/texlive/texconf.tlu26
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.tlu2
2 files changed, 22 insertions, 6 deletions
diff --git a/Master/texmf/scripts/texlive/texconf.tlu b/Master/texmf/scripts/texlive/texconf.tlu
index fe3c486ec87..9e0ef0c61b1 100755
--- a/Master/texmf/scripts/texlive/texconf.tlu
+++ b/Master/texmf/scripts/texlive/texconf.tlu
@@ -28,7 +28,9 @@ else -- no path
filename=arg[0]
end
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
+basename=select(1, string.gsub(filename, '\.tlu$', ''))
+
+usageprogname = basename
sys=false
@@ -37,6 +39,20 @@ if string.find(basename, '-sys$') then
sys=true
end
+if arg[1] == '--prog' then
+ if arg[2] == nil then
+ os.exit(1)
+ else
+ usageprogname = arg[2]
+ -- shift arguments
+ for i=1, #arg-2 do
+ arg[i] = arg[i+2]
+ end
+ arg[#arg] = nil
+ arg[#arg] = nil
+ end
+end
+
if arg[1] == '--sys' then
sys=true
-- shift arguments
@@ -468,7 +484,7 @@ function set_papersize(papersize)
if papersize == '--list' then
set_pdftex_papersize('--list')
elseif papersize == 'help' then
- io.stdout:write('Usage: '..basename..' paper PAPER\n\n'..
+ io.stdout:write('Usage: '..usageprogname..' paper PAPER\n\n'..
'Valid PAPER settings:\n a4 letter\n')
end
if papersize ~= 'a4' and papersize ~= 'letter' then
@@ -496,14 +512,14 @@ function usage_main()
}
io.stdout:write('Usage:\n')
for i, msg in ipairs(usage) do
- io.stdout:write(' '..basename..' '..msg..'\n')
+ io.stdout:write(' '..usageprogname..' '..msg..'\n')
end
os.exit(0)
end
function usage_paper(progname)
- io.stdout:write('Usage: '..basename..' '..progname..' paper PAPER\n')
- io.stdout:write(' '..basename..' '..progname..' help\n')
+ io.stdout:write('Usage: '..usageprogname..' '..progname..' paper PAPER\n')
+ io.stdout:write(' '..usageprogname..' '..progname..' help\n')
os.exit(0)
end
diff --git a/Master/texmf/scripts/texlive/tlmgr.tlu b/Master/texmf/scripts/texlive/tlmgr.tlu
index bb1743dba21..622b3cd47df 100755
--- a/Master/texmf/scripts/texlive/tlmgr.tlu
+++ b/Master/texmf/scripts/texlive/tlmgr.tlu
@@ -198,7 +198,7 @@ elseif arg[1] == 'paper' then
-- all changes made via tlmgr paper are global
script = findscript('texconf.tlu')
if script then
- command = { 'texlua', script, '--sys' }
+ command = { 'texlua', script, '--prog', 'tlmgr', '--sys' }
else
os.exit(1)
end