tlmgr.texlua moved to /texmf/scripts.

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

26 files changed, 340 insertions, 3079 deletions

diff --git a/Master/bin/alpha-linux/tlmgr b/Master/bin/alpha-linux/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/alpha-linux/tlmgr
+++ b/Master/bin/alpha-linux/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/hppa-hpux/tlmgr b/Master/bin/hppa-hpux/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/hppa-hpux/tlmgr
+++ b/Master/bin/hppa-hpux/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/tlmgr b/Master/bin/i386-darwin/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/i386-darwin/tlmgr
+++ b/Master/bin/i386-darwin/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/tlmgr b/Master/bin/i386-freebsd/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/i386-freebsd/tlmgr
+++ b/Master/bin/i386-freebsd/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/i386-linux/tlmgr b/Master/bin/i386-linux/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/i386-linux/tlmgr
+++ b/Master/bin/i386-linux/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/i386-openbsd/tlmgr b/Master/bin/i386-openbsd/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/i386-openbsd/tlmgr
+++ b/Master/bin/i386-openbsd/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/tlmgr b/Master/bin/i386-solaris/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/i386-solaris/tlmgr
+++ b/Master/bin/i386-solaris/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/mips-irix/tlmgr b/Master/bin/mips-irix/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/mips-irix/tlmgr
+++ b/Master/bin/mips-irix/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/powerpc-aix/tlmgr b/Master/bin/powerpc-aix/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/powerpc-aix/tlmgr
+++ b/Master/bin/powerpc-aix/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/powerpc-darwin/tlmgr b/Master/bin/powerpc-darwin/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/powerpc-darwin/tlmgr
+++ b/Master/bin/powerpc-darwin/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/tlmgr b/Master/bin/powerpc-linux/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/powerpc-linux/tlmgr
+++ b/Master/bin/powerpc-linux/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/sparc-linux/tlmgr b/Master/bin/sparc-linux/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/sparc-linux/tlmgr
+++ b/Master/bin/sparc-linux/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/tlmgr b/Master/bin/sparc-solaris/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/sparc-solaris/tlmgr
+++ b/Master/bin/sparc-solaris/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/bin/win32/epstopdf.texlua b/Master/bin/win32/epstopdf.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/epstopdf.texlua
+++ b/Master/bin/win32/epstopdf.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/fmtutil-sys.texlua b/Master/bin/win32/fmtutil-sys.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/fmtutil-sys.texlua
+++ b/Master/bin/win32/fmtutil-sys.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/getnonfreefonts-sys.texlua b/Master/bin/win32/getnonfreefonts-sys.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/getnonfreefonts-sys.texlua
+++ b/Master/bin/win32/getnonfreefonts-sys.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/getnonfreefonts.texlua b/Master/bin/win32/getnonfreefonts.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/getnonfreefonts.texlua
+++ b/Master/bin/win32/getnonfreefonts.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/texdoctk.texlua b/Master/bin/win32/texdoctk.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/texdoctk.texlua
+++ b/Master/bin/win32/texdoctk.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/thumbpdf.texlua b/Master/bin/win32/thumbpdf.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/thumbpdf.texlua
+++ b/Master/bin/win32/thumbpdf.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/tlmgr.texlua b/Master/bin/win32/tlmgr.texlua
index f5cbb5c168b..d99b8edffdb 100755
--- a/Master/bin/win32/tlmgr.texlua
+++ b/Master/bin/win32/tlmgr.texlua
@@ -1,207 +1,88 @@
 #! /usr/bin/env texlua
 --*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
+-- $Id: epstopdf.texlua 7266 2008-03-31 19:15:48Z reinhardk $
 
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
+-- Copyright (C) 2007 Reinhard Kotucha, Norbert Preining.
 -- You may freely use, modify and/or distribute this file.
 
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
+-- Wrapper for scripts.
 
 function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
+   if os.type == 'windows' then
+      local args_win={}  -- new table
+      args_win[0]=args_unix[1]
+      for i=1, #args_unix do  
+	 args_win[i]='"'..args_unix[i]..'"'
+      end
+      return args_win
+   else
+      return args_unix
+   end
 end
 
 if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
+   filename=select(1, string.gsub(arg[0], '.*/', ''))
 elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
+   filename=select(1, string.gsub(arg[0], '.*\\', ''))
 else -- no path
-  filename=arg[0]
+   filename=arg[0]
 end
 
-
 basename=select(1, string.gsub(filename, '\.texlua$', ''))
 
+sys=false
+
+if string.find(basename, '-sys$') then
+   basename=select(1, string.gsub(basename, '-sys$', ''))
+   sys=true
+end
+
 kpse.set_program_name(filename, basename)
 TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
 BINDIR=kpse.var_value('SELFAUTOLOC')
 
+perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
 
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
+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'))
 
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
+if sys then
+   os.setenv('TEXMFVAR', kpse.var_value('TEXMFSYSVAR'))
+   os.setenv('TEXMFCONFIG', kpse.var_value('TEXMFSYSCONFIG'))
+   os.setenv('TEX_SYS_PROG', 'true')
 end
 
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
+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.isfile(BINDIR..'/'..basename..'.pl') then
+   script=BINDIR..'/'..basename..'.pl'
+   command={perlbin, script}
+elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
+   script=kpse.find_file(basename..'.pl', 'texmfscripts')
+   command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
+else
+   io.stderr:write(filename..'.texlua: '..basename..
+		   ': No appropriate script found.\n') 
 end
 
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
 for i=1, #arg do
-  command[#command+1]=arg[i]
+    command[#command+1]=arg[i]
 end
 
 command=fixwin(command)
 
-ret=os.spawn(command)
+--[[ Prepend an additional hyphen to activate this code.
+for i=0, #command do
+   print (command[i])
+end
 os.exit(ret)
+--]]
 
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+ret=os.spawn(command)
+os.exit(ret)
diff --git a/Master/bin/win32/updmap-sys.texlua b/Master/bin/win32/updmap-sys.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/updmap-sys.texlua
+++ b/Master/bin/win32/updmap-sys.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/win32/updmap.texlua b/Master/bin/win32/updmap.texlua
index ddf32fbd1e7..68b87f2272d 100755
--- a/Master/bin/win32/updmap.texlua
+++ b/Master/bin/win32/updmap.texlua
@@ -63,6 +63,9 @@ elseif lfs.isfile(BINDIR..'/'..basename..'.pl') then
 elseif kpse.find_file(basename..'.pl', 'texmfscripts') then
    script=kpse.find_file(basename..'.pl', 'texmfscripts')
    command={perlbin, script}
+elseif kpse.find_file(basename..'.texlua', 'texmfscripts') then
+   script=kpse.find_file(basename..'.texlua', 'texmfscripts')
+   command={'texlua', script}
 else
    io.stderr:write(filename..'.texlua: '..basename..
 		   ': No appropriate script found.\n') 
diff --git a/Master/bin/x86_64-linux/tlmgr b/Master/bin/x86_64-linux/tlmgr
index f5cbb5c168b..6636a9f18a7 100755..120000
--- a/Master/bin/x86_64-linux/tlmgr
+++ b/Master/bin/x86_64-linux/tlmgr
@@ -1,207 +1 @@
-#! /usr/bin/env texlua
---*-Lua-*-
--- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
-
--- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
--- You may freely use, modify and/or distribute this file.
-
--- tlmgr
--- one central managment utility for TeX Live
--- it calls several supporting scripts from texmf/scripts/texlive
--- and other places
---
--- Currently supported arguments
---  help              local, not implemented
---  generate-fmtutil  generate-fmtutil.pl
---  generate-updmap   generate-updmap.pl
---  generate-language generate-language.pl
---  uninstall         uninstall-tl.pl and local code
---  update            tl-package-manager.pl
---  install           tl-package-manager.pl
---  remove            tl-package-manager.pl
---  search            tl-package-manager.pl
---  globalsearch      tl-package-manager.pl
---  *                 tl-package-manager.pl
-
-function fixwin(args_unix)
-  if os.type == 'windows' then
-    local args_win={}  -- new table
-    args_win[0]=args_unix[1]
-    for i=1, #args_unix do  
-      args_win[i]='"'..args_unix[i]..'"'
-    end
-    return args_win
-  else
-    return args_unix
-  end
-end
-
-function setupperl()
-  -- For Windows we use the shipped perl interpreter, otherwise we expect 
-  -- a perl to be installed
-  if  os.type == 'windows' then
-    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
-    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
-  else
-    perlbin = 'perl'
-  end
-end
-
-function findscript(scriptname)
-  local script = kpse.find_file(scriptname, 'texmfscripts')
-  if script then
-    return script
-  else
-    io.stderr:write(filename..': Cannot find script '..scriptname)
-    return false
-  end
-end
-
-function rmdir(name)
-  if os.type == 'windows' then
-    -- code from Hans
-    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
-  else
-    ret = os.spawn({"rm", "-rf", name})
-  end
-  local ok = lfs.attributes(name)
-  if ok then
-    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
-  end
-  return ok
-end
-
-if string.find(arg[0], '/') then -- UNIX path
-  filename=select(1, string.gsub(arg[0], '.*/', ''))
-elseif string.find(arg[0], '\\') then -- Windows path
-  filename=select(1, string.gsub(arg[0], '.*\\', ''))
-else -- no path
-  filename=arg[0]
-end
-
-
-basename=select(1, string.gsub(filename, '\.texlua$', ''))
-
-kpse.set_program_name(filename, basename)
-TEXDIR=kpse.var_value('SELFAUTOPARENT')
-TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
-BINDIR=kpse.var_value('SELFAUTOLOC')
-
-
-if arg[1] == 'help' then
-  print ("Usage: not implemented")
-  os.exit(0)
-end
-
-if  arg[1] == 'uninstall' then
-  print("If you answer yes here the whole TeX Live installation will be removed!")
-  io.stdout:write("Remove TeX Live (y/N): ") 
-  local yesno = io.read()
-  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
-    print ("Ok, removing the whole installation:")
-    -- we have to call perl uninstall-tl.pl AND have to remove the following 
-    -- files:
-    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
-    -- TEXDIR/install-tl.log, TEXMFSYSVAR
-    -- that should remove all the stuff
-    -- Or other options?
-    setupperl()
-    script = findscript('uninstall-tl.pl')
-    if script then
-      command = { perlbin, script }
-    else
-      os.exit(1)
-    end
-    for i=1, #arg do
-      command[#command+1] = arg[i]
-    end
-    command = fixwin(command)
-    ret = os.spawn(command)
-    -- here we should check the return value!!!
-    if not ret then
-      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
-      io.stderr:write(filename..": We don't continue removing stuff\n")
-      os.exit(1)
-    end
-    -- on windows we have now removed the associations etc, while
-    -- on unix we have removed the symlinks in case they were present
-    --
-    -- now we have to remove all the files and directories
-    rmdir(TEXDIR.."/texmf-dist")
-    rmdir(TEXDIR.."/texmf-doc")
-    rmdir(TEXDIR.."/texmf-var")
-    rmdir(TEXDIR.."/texmf-config")
-    rmdir(TEXDIR.."/texmf")
-    rmdir(TEXDIR.."/tlpkg")
-    os.remove(TEXDIR.."/temp")
-    os.remove(TEXDIR.."/install-tl.log")
-    rmdir(TEXDIR.."/bin")
-    -- now everything should be removed, try to remove also TEXDIR
-    -- this will not succeed on win32 since texlua.exe is still in use
-    -- and thus removing TEXDIR/bin will not work. Damned.
-    os.remove(TEXDIR)
-    os.exit(0)
-  else
-    print("Ok, cancelling the removal.")
-    os.exit(0)
-  end
-end
-
-if arg[1] == 'generate-fmtutil' then
-  setupperl()
-  script = findscript('generate-fmtutil.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-language' then
-  setupperl()
-  script = findscript('generate-language.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
-if arg[1] == 'generate-updmap' then
-  setupperl()
-  script = findscript('generate-updmap.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
-end
-
--- in all other cases we call tl-package-manager for now ...
---
--- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
---  arg[1] == 'globalsearch' then
-  setupperl()
-  script = findscript('tl-package-manager.pl')
-  if script then
-    command = { perlbin, script }
-  else
-    os.exit(1)
-  end
--- end
-
-for i=1, #arg do
-  command[#command+1]=arg[i]
-end
-
-command=fixwin(command)
-
-ret=os.spawn(command)
-os.exit(ret)
-
--- Local Variables:
--- perl-indent-level: 2
--- tab-width: 2
--- indent-tabs-mode: nil
--- End:
--- vim:set tabstop=2 expandtab: --
+../../texmf/scripts/texlive/tlmgr.texlua
\ No newline at end of file
diff --git a/Master/texmf-dist/ls-R b/Master/texmf-dist/ls-R
index 0aaab8cd3f8..3ef8e6d9e1f 100644
--- a/Master/texmf-dist/ls-R
+++ b/Master/texmf-dist/ls-R
@@ -67,6 +67,7 @@ jurabib
 lsc
 minitoc
 msc
+nostarch
 philosophersimprint
 pst-labo
 revtex
@@ -220,6 +221,9 @@ minitoc.bib
 ./bibtex/bib/msc:
 biblio.bib
 
+./bibtex/bib/nostarch:
+nostarch.bib
+
 ./bibtex/bib/philosophersimprint:
 philosophersimprint.bib
 
@@ -4873,6 +4877,7 @@ noitcrul
 nomencl
 nomentbl
 nonfloat
+nostarch
 notes
 notes2bib
 nrc
@@ -8294,7 +8299,6 @@ formular.pdf
 ./doc/latex/fouridx:
 README
 fouridx.pdf
-fouridx.tex
 
 ./doc/latex/fp:
 README
@@ -9906,7 +9910,7 @@ millertest.tex
 
 ./doc/latex/minipage-marginpar:
 README
-mpgmpar.pdf
+minipage-marginpar.pdf
 
 ./doc/latex/miniplot:
 disclaimer.txt
@@ -10627,6 +10631,17 @@ nomentbl.pdf
 ./doc/latex/nonfloat:
 nonfloat.pdf
 
+./doc/latex/nostarch:
+100euroie.png
+100euroit.png
+1eurogr.jpg
+README
+nostarch.pdf
+nssample.pdf
+nssample.tex
+recycled.png
+vitruvian.jpg
+
 ./doc/latex/notes:
 notes.dvi
 testnotes.dvi
@@ -11106,9 +11121,6 @@ README.txt
 TODO
 
 ./doc/latex/pdfpages:
-README
-dummy-l.pdf
-dummy.pdf
 pdf-ex.tex
 pdf-hyp.tex
 pdf-toc.tex
@@ -46331,6 +46343,7 @@ mkind-german
 multibib
 nomencl
 nomentbl
+nostarch
 plain
 progkeys
 repeatindex
@@ -46416,6 +46429,9 @@ nomencl.ist
 ./makeindex/nomentbl:
 nomentbl.ist
 
+./makeindex/nostarch:
+nostarch.ist
+
 ./makeindex/plain:
 plaintex.ist
 
@@ -48962,6 +48978,7 @@ noitcrul
 nomencl
 nomentbl
 nonfloat
+nostarch
 notes
 notes2bib
 nrc
@@ -51724,8 +51741,8 @@ miller.dtx
 miller.ins
 
 ./source/latex/minipage-marginpar:
-mpgmpar.dtx
-mpgmpar.ins
+minipage-marginpar.dtx
+minipage-marginpar.ins
 
 ./source/latex/minitoc:
 fminitoc.dtx
@@ -51928,6 +51945,11 @@ nonfloat.drv
 nonfloat.dtx
 nonfloat.ins
 
+./source/latex/nostarch:
+Makefile
+nostarch.dtx
+nostarch.ins
+
 ./source/latex/notes:
 Makefile
 book.layout
@@ -52173,6 +52195,9 @@ pdfcprot.dtx
 pdfcprot.ins
 
 ./source/latex/pdfpages:
+README
+dummy-l.pdf
+dummy.pdf
 pdfpages.dtx
 pdfpages.ins
 
@@ -56786,6 +56811,7 @@ noitcrul
 nomencl
 nomentbl
 nonfloat
+nostarch
 notes
 notes2bib
 nrc
@@ -61929,6 +61955,7 @@ mt-zpeu.cfg
 miller.sty
 
 ./tex/latex/minipage-marginpar:
+minipage-marginpar.sty
 mpgmpar.sty
 
 ./tex/latex/miniplot:
@@ -62489,6 +62516,10 @@ nomentbl.sty
 ./tex/latex/nonfloat:
 nonfloat.sty
 
+./tex/latex/nostarch:
+nostarch.cls
+nshyper.sty
+
 ./tex/latex/notes:
 notes.sty
 
diff --git a/Master/texmf/ls-R b/Master/texmf/ls-R
index a2574a292cd..8b042d31ce0 100644
--- a/Master/texmf/ls-R
+++ b/Master/texmf/ls-R
@@ -304,6 +304,7 @@ mf-nowin.1
 mf.1
 mft.1
 mkindex.1
+mkjobtexmf.1
 mkocp.1
 mkofm.1
 mktexfmt.1
@@ -3882,6 +3883,7 @@ generate-language.pl
 generate-updmap.pl
 getnonfreefonts.pl
 tl-package-manager.pl
+tlmgr.texlua
 uninstall-tl.pl
 
 ./scripts/xindy:
diff --git a/Master/texmf/scripts/texlive/tlmgr.texlua b/Master/texmf/scripts/texlive/tlmgr.texlua
new file mode 100755
index 00000000000..f5cbb5c168b
--- /dev/null
+++ b/Master/texmf/scripts/texlive/tlmgr.texlua
@@ -0,0 +1,207 @@
+#! /usr/bin/env texlua
+--*-Lua-*-
+-- $Id: tlmgr 7301 2008-04-03 16:52:55Z preining $
+
+-- Copyright (C) 2008 Reinhard Kotucha, Norbert Preining.
+-- You may freely use, modify and/or distribute this file.
+
+-- tlmgr
+-- one central managment utility for TeX Live
+-- it calls several supporting scripts from texmf/scripts/texlive
+-- and other places
+--
+-- Currently supported arguments
+--  help              local, not implemented
+--  generate-fmtutil  generate-fmtutil.pl
+--  generate-updmap   generate-updmap.pl
+--  generate-language generate-language.pl
+--  uninstall         uninstall-tl.pl and local code
+--  update            tl-package-manager.pl
+--  install           tl-package-manager.pl
+--  remove            tl-package-manager.pl
+--  search            tl-package-manager.pl
+--  globalsearch      tl-package-manager.pl
+--  *                 tl-package-manager.pl
+
+function fixwin(args_unix)
+  if os.type == 'windows' then
+    local args_win={}  -- new table
+    args_win[0]=args_unix[1]
+    for i=1, #args_unix do  
+      args_win[i]='"'..args_unix[i]..'"'
+    end
+    return args_win
+  else
+    return args_unix
+  end
+end
+
+function setupperl()
+  -- For Windows we use the shipped perl interpreter, otherwise we expect 
+  -- a perl to be installed
+  if  os.type == 'windows' then
+    perlbin=TEXDIR..'/tlpkg/tlperl/bin/perl.exe'
+    os.setenv('PERL5LIB', TEXDIR..'/tlpkg/tlperl/lib')
+  else
+    perlbin = 'perl'
+  end
+end
+
+function findscript(scriptname)
+  local script = kpse.find_file(scriptname, 'texmfscripts')
+  if script then
+    return script
+  else
+    io.stderr:write(filename..': Cannot find script '..scriptname)
+    return false
+  end
+end
+
+function rmdir(name)
+  if os.type == 'windows' then
+    -- code from Hans
+    os.execute("rmdir /s /q " .. name:gsub('/', '\\'))
+  else
+    ret = os.spawn({"rm", "-rf", name})
+  end
+  local ok = lfs.attributes(name)
+  if ok then
+    io.stderr:write(string.format("%s: removing '%s' didn't succeed\n",filename,name))
+  end
+  return ok
+end
+
+if string.find(arg[0], '/') then -- UNIX path
+  filename=select(1, string.gsub(arg[0], '.*/', ''))
+elseif string.find(arg[0], '\\') then -- Windows path
+  filename=select(1, string.gsub(arg[0], '.*\\', ''))
+else -- no path
+  filename=arg[0]
+end
+
+
+basename=select(1, string.gsub(filename, '\.texlua$', ''))
+
+kpse.set_program_name(filename, basename)
+TEXDIR=kpse.var_value('SELFAUTOPARENT')
+TEXMFSYSVAR=kpse.var_value('TEXMFSYSVAR')
+BINDIR=kpse.var_value('SELFAUTOLOC')
+
+
+if arg[1] == 'help' then
+  print ("Usage: not implemented")
+  os.exit(0)
+end
+
+if  arg[1] == 'uninstall' then
+  print("If you answer yes here the whole TeX Live installation will be removed!")
+  io.stdout:write("Remove TeX Live (y/N): ") 
+  local yesno = io.read()
+  if yesno == 'y' or yesno == 'Y' or yesno == 'yes' or yesno == 'YES' then
+    print ("Ok, removing the whole installation:")
+    -- we have to call perl uninstall-tl.pl AND have to remove the following 
+    -- files:
+    -- TEXDIR/texmf{,-dist,-doc,-var,-config,}, TEXDIR/bin, TEXDIR/tlpkg, 
+    -- TEXDIR/install-tl.log, TEXMFSYSVAR
+    -- that should remove all the stuff
+    -- Or other options?
+    setupperl()
+    script = findscript('uninstall-tl.pl')
+    if script then
+      command = { perlbin, script }
+    else
+      os.exit(1)
+    end
+    for i=1, #arg do
+      command[#command+1] = arg[i]
+    end
+    command = fixwin(command)
+    ret = os.spawn(command)
+    -- here we should check the return value!!!
+    if not ret then
+      io.stderr:write(filename..': The removal script uninstall-tl.pl returned false\n')
+      io.stderr:write(filename..": We don't continue removing stuff\n")
+      os.exit(1)
+    end
+    -- on windows we have now removed the associations etc, while
+    -- on unix we have removed the symlinks in case they were present
+    --
+    -- now we have to remove all the files and directories
+    rmdir(TEXDIR.."/texmf-dist")
+    rmdir(TEXDIR.."/texmf-doc")
+    rmdir(TEXDIR.."/texmf-var")
+    rmdir(TEXDIR.."/texmf-config")
+    rmdir(TEXDIR.."/texmf")
+    rmdir(TEXDIR.."/tlpkg")
+    os.remove(TEXDIR.."/temp")
+    os.remove(TEXDIR.."/install-tl.log")
+    rmdir(TEXDIR.."/bin")
+    -- now everything should be removed, try to remove also TEXDIR
+    -- this will not succeed on win32 since texlua.exe is still in use
+    -- and thus removing TEXDIR/bin will not work. Damned.
+    os.remove(TEXDIR)
+    os.exit(0)
+  else
+    print("Ok, cancelling the removal.")
+    os.exit(0)
+  end
+end
+
+if arg[1] == 'generate-fmtutil' then
+  setupperl()
+  script = findscript('generate-fmtutil.pl')
+  if script then
+    command = { perlbin, script }
+  else
+    os.exit(1)
+  end
+end
+
+if arg[1] == 'generate-language' then
+  setupperl()
+  script = findscript('generate-language.pl')
+  if script then
+    command = { perlbin, script }
+  else
+    os.exit(1)
+  end
+end
+
+if arg[1] == 'generate-updmap' then
+  setupperl()
+  script = findscript('generate-updmap.pl')
+  if script then
+    command = { perlbin, script }
+  else
+    os.exit(1)
+  end
+end
+
+-- in all other cases we call tl-package-manager for now ...
+--
+-- if arg[1] == 'install' or arg[1] == 'remove' or arg[1] == 'search' or
+--  arg[1] == 'globalsearch' then
+  setupperl()
+  script = findscript('tl-package-manager.pl')
+  if script then
+    command = { perlbin, script }
+  else
+    os.exit(1)
+  end
+-- end
+
+for i=1, #arg do
+  command[#command+1]=arg[i]
+end
+
+command=fixwin(command)
+
+ret=os.spawn(command)
+os.exit(ret)
+
+-- Local Variables:
+-- perl-indent-level: 2
+-- tab-width: 2
+-- indent-tabs-mode: nil
+-- End:
+-- vim:set tabstop=2 expandtab: --