summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-28 22:47:02 +0000
committerKarl Berry <karl@freefriends.org>2019-01-28 22:47:02 +0000
commitce06e970533ac446a5229a6e05dcbc305ef16075 (patch)
tree502f080f309d849aeb23b7a91a1d5ecd9b388305
parent708ca6d80de4ace083376877e5ee9160a9f9001f (diff)
consistently use $0 on tldie msgs; precede with newline
git-svn-id: svn://tug.org/texlive/trunk@49855 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl13
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm7
2 files changed, 11 insertions, 9 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 49f7e56da62..620893b4e4c 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -1,7 +1,6 @@
#!/usr/bin/env perl
# $Id$
-#
-# Copyright 2007-2018
+# Copyright 2007-2019
# Reinhard Kotucha, Norbert Preining, Karl Berry, Siep Kroonenberg.
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -471,7 +470,8 @@ if (TeXLive::TLCrypto::setup_checksum_method()) {
log("Trying to verify cryptographic signatures!\n")
} else {
if ($opt_verify_downloads) {
- tldie("No gpg found, verification explicitly requested on command line, quitting.\n");
+ tldie("$0: No gpg found, but verification explicitly requested "
+ . "on command line, so quitting.\n");
} else {
# implicitly requested, just
debug("Couldn't detect gpg so will proceed without verification!\n");
@@ -546,7 +546,8 @@ if (!$opt_custom_bin && (platform() eq "i386-cygwin")) {
chomp( my $un = `uname -r`);
if ($un =~ m/^(\d+)\.(\d+)\./) {
if ($1 < 2 && $2 < 7) {
- tldie("\nSorry, the TL binaries require at least cygwin 1.7.\n");
+ tldie("$0: Sorry, the TL binaries require at least cygwin 1.7, "
+ . "not $1.$2\n");
}
}
}
@@ -833,8 +834,8 @@ sub final_remote_init {
info("Platform overridden, binaries taken from $opt_custom_bin\n"
. "and will be installed into .../bin/custom.\n");
} else {
- tldie("$opt_custom_bin: Argument to -custom-bin must be a directory "
- . "with TeX Live binaries.\n");
+ tldie("$0: -custom-bin argument must be a directory "
+ . "with TeX Live binaries, not like: $opt_custom_bin\n");
}
}
if ($media eq "local_uncompressed") {
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 3f6746c36e0..cce5af67328 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -1,6 +1,6 @@
# $Id$
# TeXLive::TLUtils.pm - the inevitable utilities for TeX Live.
-# Copyright 2007-2018 Norbert Preining, Reinhard Kotucha
+# Copyright 2007-2019 Norbert Preining, Reinhard Kotucha
# This file is licensed under the GNU General Public License version 2
# or any later version.
@@ -3476,12 +3476,13 @@ sub tlwarn {
=item C<tldie ($str1, $str2, ...)>
-Uses C<tlwarn> to issue a warning, then exits with exit code 1.
+Uses C<tlwarn> to issue a warning for @_ preceded by a newline, then
+exits with exit code 1.
=cut
sub tldie {
- tlwarn(@_);
+ tlwarn("\n", @_);
if ($::gui_mode) {
Tk::exit(1);
} else {