summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-04-21 22:51:43 +0000
committerKarl Berry <karl@freefriends.org>2017-04-21 22:51:43 +0000
commitfa26d76abf0733c5756188d6072517451dd63923 (patch)
tree7f426bb19e6c27cd4d92c4fc754f3e52c902dcb9 /Build
parent1a91a5e1080f020606e6f240ad58be1ece507315 (diff)
context (Apr 20 22:20)
git-svn-id: svn://tug.org/texlive/trunk@43966 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun18
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl16
2 files changed, 21 insertions, 13 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun b/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
index b2101937a6e..6b998eb74b0 100755
--- a/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
+++ b/Build/source/texk/texlive/linked_scripts/context/stubs/unix/mtxrun
@@ -1670,7 +1670,7 @@ do -- create closure to overcome 200 locals limit
package.loaded["l-table"] = package.loaded["l-table"] or true
--- original size: 39197, stripped down to: 22960
+-- original size: 39587, stripped down to: 23144
if not modules then modules={} end modules ['l-table']={
version=1.001,
@@ -2020,7 +2020,11 @@ local function is_simple_table(t)
local v=t[i]
local tv=type(v)
if tv=="number" then
- tt[i]=v
+ if hexify then
+ tt[i]=format("0x%X",v)
+ else
+ tt[i]=v
+ end
elseif tv=="string" then
tt[i]=format("%q",v)
elseif tv=="boolean" then
@@ -2036,7 +2040,11 @@ local function is_simple_table(t)
local v=t[i]
local tv=type(v)
if tv=="number" then
- tt[i+1]=v
+ if hexify then
+ tt[i+1]=format("0x%X",v)
+ else
+ tt[i+1]=v
+ end
elseif tv=="string" then
tt[i+1]=format("%q",v)
elseif tv=="boolean" then
@@ -20422,8 +20430,8 @@ end -- of closure
-- used libraries : l-lua.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua util-lib.lua luat-sta.lua luat-fmt.lua
-- skipped libraries : -
--- original bytes : 841485
--- stripped bytes : 305240
+-- original bytes : 841875
+-- stripped bytes : 305446
-- end library merge
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 507441cafe7..a0a0d79733e 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,13 +1,13 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 43915 2017-04-18 23:55:09Z preining $
+# $Id: tlmgr.pl 43940 2017-04-20 14:47:49Z preining $
#
# Copyright 2008-2017 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
-my $svnrev = '$Revision: 43915 $';
-my $datrev = '$Date: 2017-04-19 01:55:09 +0200 (Wed, 19 Apr 2017) $';
+my $svnrev = '$Revision: 43940 $';
+my $datrev = '$Date: 2017-04-20 16:47:49 +0200 (Thu, 20 Apr 2017) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -4037,9 +4037,9 @@ sub action_repository {
return ($F_ERROR);
}
# check if it is either url or absolute path
- if (($p !~ m!^(http|ftp)://!i) &&
+ if (($p !~ m!^(https?|ftp)://!i) &&
!File::Spec->file_name_is_absolute($p)) {
- tlwarn("$prg: neither http/ftp URL nor absolute path, no action: $p\n");
+ tlwarn("$prg: neither https?/ftp URL nor absolute path, no action: $p\n");
return ($F_ERROR);
}
my $t = shift @ARGV;
@@ -5784,7 +5784,7 @@ sub init_local_db {
# we normalize the path only if it is
# - a url starting with neither http or ftp
# - if we are on Windows, it does not start with Drive:[\/]
- if (! ( $location =~ m!^(http|ftp)://!i ||
+ if (! ( $location =~ m!^(https?|ftp)://!i ||
(win32() && (!(-e $location) || ($location =~ m!^.:[\\/]!) ) ) ) ) {
# seems to be a local path, try to normalize it
my $testloc = abs_path($location);
@@ -6026,7 +6026,7 @@ sub setup_one_remotetlpdb {
# not work
my $local_copy_tlpdb_used = 0;
- if ($location =~ m;^(http|ftp)://;) {
+ if ($location =~ m;^(https?|ftp)://;) {
# first check that the saved tlpdb is present at all
my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
my $loc_copy_of_remote_tlpdb =
@@ -6167,7 +6167,7 @@ FROZEN
# save remote database if it is a net location
# make sure that the writeout of the tlpdb is done in UNIX mode
# since otherwise the checksum will change.
- if (!$local_copy_tlpdb_used && $location =~ m;^(http|ftp)://;) {
+ if (!$local_copy_tlpdb_used && $location =~ m;^(https?|ftp)://;) {
my $loc_digest = TeXLive::TLCrypto::tl_short_digest($location);
my $loc_copy_of_remote_tlpdb =
"$Master/$InfraLocation/texlive.tlpdb.$loc_digest";