summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-04-20 06:57:24 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-04-20 06:57:24 +0000
commitf44ecae12095f5bf84e1bb9b9d68185f9d72aab1 (patch)
tree58c2d0222990e5759302fc5856503c39b3d5ad7e
parentbaac5a20b2ff053e3e94ac9524ec303257561744 (diff)
Sync scripts Master <=> Build
git-svn-id: svn://tug.org/texlive/trunk@36967 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/fmtutil.pl10
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/texlive/tlmgr.pl7
-rwxr-xr-xMaster/texmf-dist/scripts/texlive/texlinks.sh16
3 files changed, 14 insertions, 19 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
index 8cb6847dd60..a668233e3ce 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/fmtutil.pl
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: fmtutil.pl 36909 2015-04-18 16:43:48Z preining $
+# $Id: fmtutil.pl 36956 2015-04-19 23:28:01Z preining $
# fmtutil - utility to maintain format files.
# (Maintained in TeX Live:Master/texmf-dist/scripts/texlive.)
#
@@ -33,11 +33,11 @@ BEGIN {
}
-my $svnid = '$Id: fmtutil.pl 36909 2015-04-18 16:43:48Z preining $';
-my $lastchdate = '$Date: 2015-04-18 18:43:48 +0200 (Sat, 18 Apr 2015) $';
+my $svnid = '$Id: fmtutil.pl 36956 2015-04-19 23:28:01Z preining $';
+my $lastchdate = '$Date: 2015-04-20 01:28:01 +0200 (Mon, 20 Apr 2015) $';
$lastchdate =~ s/^\$Date:\s*//;
$lastchdate =~ s/ \(.*$//;
-my $svnrev = '$Revision: 36909 $';
+my $svnrev = '$Revision: 36956 $';
$svnrev =~ s/^\$Revision:\s*//;
$svnrev =~ s/\s*\$$//;
my $version = "svn$svnrev ($lastchdate)";
@@ -362,7 +362,7 @@ sub callback_build_formats {
print_info("Not selected formats: $nobuild\n") if ($nobuild);
print_info("Not available formats: $notavail\n") if ($notavail);
print_info("Failure during builds: $err\n") if ($err);
- chdir($thisdir);
+ chdir($thisdir) || warn("chdir($thisdir) failed: $!");
return 0;
}
diff --git a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
index 238e347bfc1..f4479f3c852 100755
--- a/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
+++ b/Build/source/texk/texlive/linked_scripts/texlive/tlmgr.pl
@@ -1,12 +1,12 @@
#!/usr/bin/env perl
-# $Id: tlmgr.pl 36854 2015-04-14 12:08:59Z preining $
+# $Id: tlmgr.pl 36929 2015-04-19 12:26:46Z preining $
#
# Copyright 2008-2015 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
-my $svnrev = '$Revision: 36854 $';
-my $datrev = '$Date: 2015-04-14 14:08:59 +0200 (Tue, 14 Apr 2015) $';
+my $svnrev = '$Revision: 36929 $';
+my $datrev = '$Date: 2015-04-19 14:26:46 +0200 (Sun, 19 Apr 2015) $';
my $tlmgrrevision;
my $prg;
if ($svnrev =~ m/: ([0-9]+) /) {
@@ -165,6 +165,7 @@ sub main {
"help" => { },
"info" => { "list" => 1,
"only-installed" => 1 },
+ "init-usertree" => { },
"install" => { "dry-run|n" => 1,
"file" => 1,
"force" => 1,
diff --git a/Master/texmf-dist/scripts/texlive/texlinks.sh b/Master/texmf-dist/scripts/texlive/texlinks.sh
index 028b50be9c4..91540eac147 100755
--- a/Master/texmf-dist/scripts/texlive/texlinks.sh
+++ b/Master/texmf-dist/scripts/texlive/texlinks.sh
@@ -1,5 +1,5 @@
#!/bin/sh
-# $Id: texlinks.sh 33924 2014-05-09 00:31:04Z karl $
+# $Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $
# Thomas Esser, 1999, 2002, 2003. public domain.
@@ -39,7 +39,7 @@ export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
-version='$Id: texlinks.sh 33924 2014-05-09 00:31:04Z karl $'
+version='$Id: texlinks.sh 36938 2015-04-19 21:15:06Z karl $'
progname=texlinks
cnf=fmtutil.cnf # name of the config file
@@ -69,10 +69,7 @@ Report bugs to: tex-k@tug.org
TeX Live home page: <http://tug.org/texlive/>
'
-###############################################################################
-# abort(errmsg)
-# print `errmsg' to stderr and exit with error code 1
-###############################################################################
+# print `errmsg' to stderr and exit with error code 1:
abort() { errmsg "texlinks: $1."; cleanup 1; }
# error message to stderr:
@@ -84,10 +81,7 @@ verbose_echo() { $verbose && errmsg "$@"; }
# in verbose mode: show command that is executed:
verbose_do() { verbose_echo "$@"; "$@"; }
-###############################################################################
-# cleanup()
-# clean up the temp area and exit with proper exit status
-###############################################################################
+# clean up the temp area and exit with proper exit status:
cleanup()
{
rc=$1
@@ -177,7 +171,7 @@ install_link()
# fmtutil.cnf with different engines, but the executable link
# must point to pdftex.
verbose_echo "forcing pdfcsplain destination to be pdftex"
- dest=pdftex
+ dest=pdftex$exeext
fi
verbose_do ln -s "$dest" "$src"
fi