summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2007-11-25 15:10:09 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2007-11-25 15:10:09 +0000
commit488c66de644e3776a4574a7c791503ef0923cbc0 (patch)
tree7fa06308c3eb403273f5dd3d5d846ef965b4a7f2 /Master
parentae47112501386ecf1dc9cc2ab4ef638de7ec785b (diff)
install-tl.pl: more options
git-svn-id: svn://tug.org/texlive/trunk@5591 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/install-tl.pl71
1 files changed, 47 insertions, 24 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 9eb94c6bc4b..56023f9d240 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -25,8 +25,6 @@ use TeXLive::TLPDB;
use TeXLive::TLConfig;
use Cwd;
-#print "$TeXLive::TLConfig::InfraLocation/texlive.tlpdb\n";
-
$default_scheme='scheme-full';
###$texlive_url='http://localhost/texlive/Contents/inst';
@@ -37,8 +35,6 @@ $texlive_url='http://tug.org/svn/texlive/trunk/Master/'
# smaller than the number of binaries available from the network.
$max_bins_on_CD=7;
-#$_platform_='win32';
-
initialize_installer;
my $system_tmpdir=get_system_tmpdir;
@@ -137,6 +133,8 @@ sub set_texlive_default_dirs {
'sys_info' => '/usr/local/info',
'option_doc' => 1,
'option_src' => 1,
+ 'option_fmt' => 0,
+ 'option_letter' => 0,
'selected_scheme' => $default_scheme,
);
@@ -229,22 +227,24 @@ sub calc_depends {
}
# $package.$arch package are supposed to contain ONLY binfiles
$::opt_debug = 1;
- debug("$package.$a: binsize=",$bintlp->binsize->{$a},"\n");
+# debug("$package.$a: binsize=",$bintlp->binsize->{$a},"\n");
$::opt_debug = 0;
- $size += $bintlp->binsize->{$a} if defined($bintlp->binsize->{$a});
+ $size+=$bintlp->binsize->{$a} if defined($bintlp->binsize->{$a});
}
}
} elsif ($tlpobj->category eq "Scheme") {
warn "We shouldn't work on Schemes here?!? package = $package\n";
} else {
- die "Unknown category ", $tlpobj->category, " of package $package -- ex!";
+ die "Unknown category ", $tlpobj->category,
+ " of package $package -- ex!";
}
}
}
push @allcollections, @tmp;
@workcoll = @tmp;
}
- $vars{'total_size'}=sprintf "%d", ($size * $TeXLive::TLConfig::BlockSize)/1024**2;
+ $vars{'total_size'}=
+ sprintf "%d", ($size * $TeXLive::TLConfig::BlockSize)/1024**2;
# printf "Total: %d MB\n", $size/1024**2;
}
@@ -765,9 +765,13 @@ EOF
chomp($answer=<STDIN>);
$vars{'TEXDIR'}="$answer" if (length $answer);
$vars{'TEXDIR'}=~s@\\@/@g if (win32);
- if ($vars{'TEXDIR'}=~/^(.*)\/texlive\/$texlive_release$/) {
- $vars{'TEXMFLOCAL'}="$1/texlive/texmf-local";
- $vars{'TEXMFSYSVAR'}="$1/texlive/$texlive_release/texmf-var";
+ if ($vars{'TEXDIR'}=~/^(.*)\/$texlive_release$/) {
+ $vars{'TEXMFLOCAL'}="$1/texmf-local";
+ $vars{'TEXMFSYSVAR'}="$1/$texlive_release/texmf-var";
+ return $command{'self'};
+ } elsif ($vars{'TEXDIR'}=~/^(.*)$/) {
+ $vars{'TEXMFLOCAL'}="$1/texmf-local";
+ $vars{'TEXMFSYSVAR'}="$1/texmf-var";
return $command{'self'};
}
}
@@ -805,6 +809,8 @@ sub options_menu {
my $b_symlinks=button($vars{'option_symlinks'});
my $b_doc=button($vars{'option_doc'});
my $b_src=button($vars{'option_src'});
+ my $b_fmt=button($vars{'option_fmt'});
+ my $b_letter=button($vars{'option_letter'});
my $sys_bin=$vars{'sys_bin'};
my $sys_man=$vars{'sys_man'};
@@ -823,21 +829,22 @@ sub options_menu {
clear_screen;
menu_head "Current options setup:";
+ print <<"EOF";
+ <P> use letter size instead of A4 by default: $b_letter
+ <F> create all format files: $b_fmt
+ <D> install font/macro doc tree: $b_doc
+ <S> install font/macro source tree: $b_src
+EOF
+;
if (unix) {
print <<"EOF";
- <L> create symlinks in standard directories: $b_symlinks
+ <L> create symlinks in standard directories: $b_symlinks
binaries to: $t_sys_bin
manpages to: $t_sys_man
info to: $t_sys_info
EOF
;
}
- print <<"EOF";
- <D> install font/macro doc tree: $b_doc
- <S> install font/macro source tree: $b_src
-EOF
-;
-
other_options qw(R Q);
my $answer=prompt 'Enter command';
@@ -864,6 +871,18 @@ EOF
return $command{'self'};
}
}
+ if ("\u$answer" eq 'P') {
+ toggle 'option_letter';
+ return $command{'self'};
+ }
+ if ("\u$answer" eq 'F') {
+ toggle 'option_fmt';
+ return $command{'self'};
+ }
+ if ("\u$answer" eq 'S') {
+ toggle 'option_src';
+ return $command{'self'};
+ }
if ("\u$answer" eq 'S') {
toggle 'option_src';
return $command{'self'};
@@ -891,6 +910,8 @@ sub main_menu {
my $b_symlinks=button($vars{'option_symlinks'});
my $b_doc=button($vars{'option_doc'});
my $b_src=button($vars{'option_src'});
+ my $b_fmt=button($vars{'option_fmt'});
+ my $b_letter=button($vars{'option_letter'});
my $warn_nobin;
@@ -953,15 +974,17 @@ sub main_menu {
<O> options:
EOF
;
- print <<"EOF" if (unix);
- $b_symlinks create symlinks in standard directories
-EOF
-;
print <<"EOF";
+ $b_letter use letter size instead of A4 by default
+ $b_fmt create all format files
$b_doc install macro/font doc tree
$b_src install macro/font source tree
EOF
;
+ print <<"EOF" if (unix);
+ $b_symlinks create symlinks in standard directories
+EOF
+;
other_options qw (I H Q);
my $answer=prompt 'Enter command';
@@ -1029,8 +1052,8 @@ sub add_tlpcontainer {
my $tlpobj=$::tlpdb->get_package($package);
return $tlpobj;
}
- warn "Huuu, this needs testing and error checking!\n";
- warn "Should we use -a -- adapt line endings etc?\n";
+# warn "Huuu, this needs testing and error checking!\n";
+# warn "Should we use -a -- adapt line endings etc?\n";
`$unpackprog`;
my $tlpobj=$::tlpdb->get_package($package);
$::localtlpdb->add_tlpobj($tlpobj);