summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-06-17 10:14:51 +0000
committerNorbert Preining <preining@logic.at>2009-06-17 10:14:51 +0000
commit6c07a5024d95df7de11d414f9a03923bf9a1b362 (patch)
treeaf54c78c551c8334aa95aebde5ded4eed26d4bff /Master
parent326e9421dd2dadce9ce02577212d4966f8fc30e1 (diff)
add TLUtils::tldie function, and use it in some places in install-tl
git-svn-id: svn://tug.org/texlive/trunk@13779 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl11
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm12
2 files changed, 15 insertions, 8 deletions
diff --git a/Master/install-tl b/Master/install-tl
index a4d4b6313f6..ca6fdb21f03 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -322,16 +322,14 @@ if (!$opt_custom_bin && (platform() eq "i386-cygwin")) {
chomp( my $un = `uname -r`);
if ($un =~ m/^(\d+)\.(\d+)\./) {
if ($1 < 2 && $2 < 7) {
- tlwarn("\nSorry, the TL binaries require at least cygwin 1.7.\n");
- exit(1);
+ tldie("\nSorry, the TL binaries require at least cygwin 1.7.\n");
}
}
}
if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
- tlwarn("$0: Couldn't set up the necessary programs;\n"
- . " perhaps your platform ($::_platform_) is not supported.\n");
- exit 1;
+ tldie("$0: Couldn't set up the necessary programs;\n"
+ . " perhaps your platform ($::_platform_) is not supported.\n");
}
# determine where we will find the distribution to install from.
@@ -370,8 +368,7 @@ if ($opt_custom_bin) {
if (-d $opt_custom_bin) {
info("Platform overridden, binaries taken from $opt_custom_bin\nand put into bin/custom!\n");
} else {
- tlwarn("Argument for -custom-bin needs to be directory with TeX Live binaries!\n");
- exit(1);
+ tldie("Argument for -custom-bin needs to be directory with TeX Live binaries!\n");
}
}
if ($media eq "DVD") {
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index e58eefc7d37..01f38381d24 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -125,7 +125,7 @@ BEGIN {
&announce_execute_actions
);
@EXPORT = qw(setup_programs download_file process_logging_options
- tlwarn info log debug ddebug dddebug debug_hash
+ tldie tlwarn info log debug ddebug dddebug debug_hash
win32 xchdir xsystem run_cmd);
}
@@ -2454,6 +2454,16 @@ sub tlwarn {
}
}
+=item C<tldie ($str1, $str2, ...)>
+
+Uses C<tlwarn> to issue a warning, then exits with exit code 1.
+
+=cut
+
+sub tldie {
+ tlwarn(@_);
+ exit(1);
+}
=item C<debug_hash ($label, hash))>