summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-06 02:01:49 +0000
committerKarl Berry <karl@freefriends.org>2008-11-06 02:01:49 +0000
commit0528a9bf8ca3fbd4f7d9719adbddbace94cf31b1 (patch)
treeae126584419263179b780f75ad51c8d92e4d6e82 /Master/install-tl
parent739217edbec9ad26b3c30af229dd39635bd3479f (diff)
capitalization, exclamations
git-svn-id: svn://tug.org/texlive/trunk@11200 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl44
1 files changed, 24 insertions, 20 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 0241a89bc51..994ab0e3b48 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -357,7 +357,7 @@ if ($opt_gui && !$opt_no_gui && ($opt_profile eq "")) {
if ($@) {
tlwarn("perl/Tk unusable, cannot create main windows.\n");
if (platform() eq "universal-darwin") {
- tlwarn("That could be a consequence of not having X Windows installed or started!\n");
+ tlwarn("That could be because X11 is not installed or started.\n");
}
tlwarn("Error message from creating MainWindow:\n");
tlwarn(" $@\n");
@@ -366,7 +366,7 @@ if ($opt_gui && !$opt_no_gui && ($opt_profile eq "")) {
}
if (!$opt_gui) {
# we switched from GUI to non-GUI mode, tell the user and wait a bit
- tlwarn("\nSwitching to text mode installer, if you want to cancel, do it now!\n");
+ tlwarn("\nSwitching to text mode installer, if you want to cancel, do it now.\n");
tlwarn("Waiting for 3 second\n");
sleep(3);
}
@@ -375,7 +375,9 @@ if ($opt_gui && !$opt_no_gui && ($opt_profile eq "")) {
# initialize the correct platform
platform();
if (!setup_programs ("$::installerdir/tlpkg/installer", "$::_platform_")) {
- tlwarn("Couldn't set up the necessary programs.\nCannot continue with installation.\nPlease report to texlive\@tug.org.\n");
+ tlwarn("Couldn't set up the necessary programs.\n"
+ . "Cannot continue with installation.\n"
+ . "Please report to texlive\@tug.org.\n");
exit 1;
}
$ENV{'WGETRC'}="$::installerdir/tlpkg/installer/wgetrc";
@@ -400,7 +402,7 @@ if ($location =~ m!^(http|ftp)://!i) {
} else {
if ($opt_location) {
# user gave a --location but nothing can be found there, so die
- die "Cannot find installation source at $opt_location!";
+ die "$0: cannot find installation source at $opt_location.\n";
}
# no --location given, but NET installation
$TeXLiveURL = $location = TeXLive::TLUtils::give_ctan_mirror();
@@ -462,7 +464,7 @@ if ($opt_profile eq "") {
if ($opt_profileseed) {
read_profile("$opt_profileseed");
}
- # do the normal interactive installation!
+ # do the normal interactive installation.
#
# here we could load different menu systems. Currently several things
# are "our" so that the menu implementation can use it. The $tlpdb, the
@@ -490,16 +492,16 @@ if ($opt_profile eq "") {
exit(1);
}
if ($ret == $MENU_ABORT) {
- # NO do_cleanup()!
+ # omit do_cleanup().
flushlog();
exit(2);
}
if ($ret == $MENU_ALREADYDONE) {
- debug("run_menu has already done the work ... cleaning up!\n");
+ debug("run_menu has already done the work ... cleaning up.\n");
$finished = 1;
}
if (!$finished && ($ret != $MENU_INSTALL)) {
- warn("Unknown return value of run_menu: $ret\n");
+ tlwarn("Unknown return value of run_menu: $ret\n");
exit(3);
}
} else {
@@ -770,7 +772,8 @@ sub calc_depends {
foreach $p (keys %install) {
my $tlpobj = $tlpdb->get_package($p);
if (not(defined($tlpobj))) {
- tlwarn("$p should be installed but cannot be found in texlive.tlpdb, disabling it!\n");
+ tlwarn("$p should be installed but "
+ . "is not in texlive.tlpdb; disabling.\n");
$install{$p} = 0;
next;
}
@@ -923,7 +926,7 @@ sub create_profile {
sub read_profile {
my $profilepath = shift;
open PROFILE, "<$profilepath"
- or die "Cannot open profile $profilepath for reading!\n";
+ or die "$0: Cannot open profile $profilepath for reading.\n";
my %pro;
while (<PROFILE>) {
next if m/^[[:space:]]*$/; # skip empty lines
@@ -1192,7 +1195,8 @@ operations might be disturbed.\n\n";
`cd "$vars{'sys_bin'}" && rm -f @files`;
`ln -s "$plat_bindir/"* "$vars{'sys_bin'}"`;
} else {
- info("destination of bin symlink $vars{'sys_bin'} not writable, no linking of bin files done!\n");
+ info("destination of bin symlink $vars{'sys_bin'} not writable, "
+ . "no linking of bin files done.\n");
}
if ($vars{'option_doc'}) {
# info files
@@ -1204,7 +1208,8 @@ operations might be disturbed.\n\n";
`cd "$vars{'sys_info'}" && rm -f @files`;
`ln -s "$TEXDIR/texmf/doc/info/"*info* "$vars{'sys_info'}"`;
} else {
- info("destination of info symlink $vars{'sys_info'} not writable, no linking of info files done!\n");
+ info("destination of info symlink $vars{'sys_info'} not writable, "
+ . "no linking of info files done.\n");
}
# man files
mkdirhier $vars{'sys_man'};
@@ -1224,7 +1229,8 @@ operations might be disturbed.\n\n";
`ln -s "$mandir/"* "$vars{'sys_man'}/$m"`;
}
} else {
- info("destination of man symlink $vars{'sys_man'} not writable, no linking of man files done!\n");
+ info("destination of man symlink $vars{'sys_man'} not writable, "
+ . "no linking of man files done.\n");
}
}
}
@@ -1234,7 +1240,7 @@ operations might be disturbed.\n\n";
# we have to adjust the texmf.cnf file to the paths set in the configuration!
sub do_texmf_cnf {
open(TMF,"<$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
- or die("$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!\n");
+ or die "$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!";
my @texmfcnflines = <TMF>;
close(TMF);
my @newtmf;
@@ -1291,7 +1297,7 @@ sub do_texmf_cnf {
my $TMF;
if (!$vars{'from_dvd'}) {
$TMF = ">$vars{'TEXDIR'}/texmf.cnf";
- open(TMF, $TMF) || die "open($TMF) failed: $!\n";
+ open(TMF, $TMF) || die "open($TMF) failed: $!";
print TMF <<EOF;
% This texmf.cnf file should contain only your personal changes from the
% main texmf.cnf.
@@ -1408,13 +1414,14 @@ sub do_cleanup
print $::LOGFILE "$line";
}
} else {
- warn("Cannot create log file $vars{'TEXDIRW'}/install-tl.log: $!\nNot writing out log lines!\n");
+ tlwarn("$0: Cannot create log file $vars{'TEXDIRW'}/install-tl.log: $!\n"
+ . "Not writing out log lines.\n");
}
}
# remove temporary files from TEXDIR/temp
if (($media eq "CD") or ($media eq "NET")) {
- debug("Remove temporary downloaded containers!\n");
+ debug("Remove temporary downloaded containers...\n");
rmtree("$vars{'TEXDIRW'}/temp") if (-d "$vars{'TEXDIRW'}/temp");
}
@@ -1447,9 +1454,6 @@ sub do_cleanup
} else {
print "No logfile\n";
}
- #print "Don't forget to set TEXMFSYSVAR to ".$vars{'TEXMFSYSVAR'}."!!!\n"
- #print "Don't forget to set TEXMFCNF to\n ". $vars{'TEXMFSYSVAR'}."/web2c !!!\n"
- # if ($vars{'from_dvd'} and !win32());
}
__END__