summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSiep Kroonenberg <siepo@cybercomm.nl>2008-06-16 11:22:58 +0000
committerSiep Kroonenberg <siepo@cybercomm.nl>2008-06-16 11:22:58 +0000
commit3742468b3548464728bef111d0e8c0a6b72da9a5 (patch)
tree205fdb523b2688ea2f61ac2226486e1b021387a3
parent45b87b0f5d2161405018f17d107da13d30b8f8d1 (diff)
From_dvd: full texmf.cnf in TEXMFSYSVAR. Now only 1 directory in TEXMFCNF
git-svn-id: svn://tug.org/texlive/trunk@8777 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/install-tl112
-rw-r--r--Master/tlpkg/TeXLive/TLWinGoo.pm1
2 files changed, 53 insertions, 60 deletions
diff --git a/Master/install-tl b/Master/install-tl
index a8fe488b6dd..e9e0c0de346 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -197,7 +197,7 @@ if ($#ARGV >= 0) {
die "No arguments to install-tl allowed. Try install-tl --help!";
}
}
-
+
if (defined($::opt_lang)) {
$::lang = $::opt_lang;
@@ -433,8 +433,7 @@ if ($vars{'from_dvd'}) {
close($::LOGFILE) if defined($::LOGFILE);
#print "Don't forget to set TEXMFSYSVAR to ".$vars{'TEXMFSYSVAR'}."!!!\n"
-print "Don't forget to set TEXMFCNF to\n ".
- $vars{'TEXMFSYSVAR'}."/web2c:".$vars{'TEXDIR'}."/texmf/web2c !!!\n"
+print "Don't forget to set TEXMFCNF to\n ". $vars{'TEXMFSYSVAR'}."/web2c !!!\n"
if ($vars{'from_dvd'} and !win32());
exit(0);
@@ -461,8 +460,7 @@ sub do_installation {
if (win32()) {
add_texbindir_to_path($vars{'TEXDIR'}.'/bin/win32');
# setenv_reg('TEXMFSYSVAR', $vars{'TEXMFSYSVAR'}) if $vars{'from_dvd'};
- setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c;'.
- $vars{'TEXDIR'}.'/texmf/web2c') if $vars{'from_dvd'};
+ setenv_reg('TEXMFCNF', $vars{'TEXMFSYSVAR'}.'/web2c') if $vars{'from_dvd'};
broadcast_env();
create_uninstaller($vars{'TEXDIR'}, $vars{'TEXDIRW'},
$vars{'TEXMFSYSVAR'}, $vars{'TEXMFSYSCONFIG'});
@@ -1047,68 +1045,62 @@ 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 {
- if (!$vars{'from_dvd'}) {
- open(TMF,"<$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
- or die("$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!\n");
- my @texmfcnflines = <TMF>;
- close(TMF);
- my @newtmf;
- # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME
- foreach my $line (@texmfcnflines) {
- if ($line =~ m/^TEXMFLOCAL/) {
- # by default TEXMFLOCAL = TEXDIR/../texmf-local, if this is the case
- # we don't have to change anything from the default
- my $deftmlocal = dirname($vars{'TEXDIR'});
- $deftmlocal .= "/texmf-local";
- if ("$vars{'TEXMFLOCAL'}" eq "$deftmlocal") {
- push @newtmf, $line;
- } else {
- push @newtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
- }
- } elsif ($line =~ m/^TEXMFSYSVAR/) {
- # by default TEXMFSYSVAR = TEXDIR/texmf-var, if this is the case
- # we don't have to change anything from the default
- if ("$vars{'TEXMFSYSVAR'}" eq "$vars{'TEXDIR'}/texmf-var") {
- push @newtmf, $line;
- } else {
- push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
- }
- } elsif ($line =~ m/^TEXMFSYSCONFIG/) {
- # by default TEXMFSYSCONFIG = TEXDIR/texmf-config, if this is the case
- # we don't have to change anything from the default
- if ("$vars{'TEXMFSYSCONFIG'}" eq "$vars{'TEXDIR'}/texmf-config") {
- push @newtmf, $line;
- } else {
- push @newtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
- }
- } elsif ($line =~ m/^TEXMFHOME/) {
- # kpse now expands ~ to USERPROFILE, so we don't treat win32 and
- # unix differently
- push @newtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
- } elsif ($line =~ m/^OSFONTDIR/) {
- if (win32()) {
- push @newtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
- } else {
- push @newtmf, $line;
- }
+ open(TMF,"<$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
+ or die("$vars{'TEXDIR'}/texmf/web2c/texmf.cnf not found: $!\n");
+ my @texmfcnflines = <TMF>;
+ close(TMF);
+ my @newtmf;
+ # we have to find TEXMFLOCAL TEXMFSYSVAR and TEXMFHOME
+ foreach my $line (@texmfcnflines) {
+ if ($line =~ m/^TEXMFLOCAL/) {
+ # by default TEXMFLOCAL = TEXDIR/../texmf-local, if this is the case
+ # we don't have to change anything from the default
+ my $deftmlocal = dirname($vars{'TEXDIR'});
+ $deftmlocal .= "/texmf-local";
+ if ("$vars{'TEXMFLOCAL'}" eq "$deftmlocal") {
+ push @newtmf, $line;
} else {
+ push @newtmf, "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
+ }
+ } elsif ($line =~ m/^TEXMFSYSVAR/) {
+ # by default TEXMFSYSVAR = TEXDIR/texmf-var, if this is the case
+ # we don't have to change anything from the default
+ if ("$vars{'TEXMFSYSVAR'}" eq "$vars{'TEXDIR'}/texmf-var") {
push @newtmf, $line;
+ } else {
+ push @newtmf, "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
+ }
+ } elsif ($line =~ m/^TEXMFSYSCONFIG/) {
+ # by default TEXMFSYSCONFIG = TEXDIR/texmf-config, if this is the case
+ # we don't have to change anything from the default
+ if ("$vars{'TEXMFSYSCONFIG'}" eq "$vars{'TEXDIR'}/texmf-config") {
+ push @newtmf, $line;
+ } else {
+ push @newtmf, "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
}
+ } elsif ($line =~ m/^TEXMFHOME/) {
+ # kpse now expands ~ to USERPROFILE, so we don't treat win32 and
+ # unix differently
+ push @newtmf, "TEXMFHOME = $vars{'TEXMFHOME'}\n";
+ } elsif ($line =~ m/^OSFONTDIR/) {
+ if (win32()) {
+ push @newtmf, "OSFONTDIR = \$SystemRoot/fonts//\n";
+ } else {
+ push @newtmf, $line;
+ }
+ } else {
+ push @newtmf, $line;
}
+ }
+ if (!$vars{'from_dvd'}) {
open(TMF,">$vars{'TEXDIR'}/texmf/web2c/texmf.cnf")
or die("Can't open $vars{'TEXDIR'}/texmf/web2c/texmf.cnf for writing: $!\n");
- foreach (@newtmf) { print TMF; }
- close(TMF);
- } else { # $vars{'from_dvd'}
- open(TMF,">>$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf")
- or die(
- "Cannot open $vars{'TEXMFSYSVAR'}/web2c/texmf.cnf for writing: $!\n");
- print TMF "TEXMFLOCAL = $vars{'TEXMFLOCAL'}\n";
- print TMF "TEXMFSYSVAR = $vars{'TEXMFSYSVAR'}\n";
- print TMF "TEXMFSYSCONFIG = $vars{'TEXMFSYSCONFIG'}\n";
- print TMF "TEXMFHOME = $vars{'TEXMFHOME'}\n";
- print TMF "OSFONTDIR = \$SystemRoot/fonts//\n" if win32();
+ } else {
+ open(TMF,">$vars{'TEXMFSYSVAR'}/web2c/texmf.cnf")
+ or die("Can't open $vars{'TEXMFSYSVAR'}/web2c/texmf.cnf for writing: $!\n");
}
+ foreach (@newtmf) { print TMF; }
+ close(TMF);
}
#
diff --git a/Master/tlpkg/TeXLive/TLWinGoo.pm b/Master/tlpkg/TeXLive/TLWinGoo.pm
index 209e516cde2..24e5ead4b96 100644
--- a/Master/tlpkg/TeXLive/TLWinGoo.pm
+++ b/Master/tlpkg/TeXLive/TLWinGoo.pm
@@ -1019,6 +1019,7 @@ set PERL5LIB=
\"$td\\tlpkg\\tlperl\\bin\\perl.exe\" \"$td\\texmf\\scripts\\texlive\\uninstall-win32.pl\"
call \"$tdw\\tlpkg\\installer\\unshort.bat\"
copy \"$tdw\\tlpkg\\installer\\uninst2.bat\" \"\%TEMP\%\"
+pause
\"\%TEMP\%\\uninst2.bat\"
UNEND
;