1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
|
Index: tlpkg/TeXLive/TLConfig.pm
===================================================================
--- tlpkg/TeXLive/TLConfig.pm (revision 14499)
+++ tlpkg/TeXLive/TLConfig.pm (working copy)
@@ -162,11 +162,13 @@
our %TLPDBSettingType = (
"platform" => "s",
- "available_architectures" => "l"
+ "available_architectures" => "l",
+ "usertree" => "b"
);
our %TLPDBSettingDesc = (
"platform" => "Main platform for this computer",
- "available_architectures" => "All available/installed architectures"
+ "available_architectures" => "All available/installed architectures",
+ "usertree" => "This tree acts as user tree"
);
Index: tlpkg/TeXLive/TLPOBJ.pm
===================================================================
--- tlpkg/TeXLive/TLPOBJ.pm (revision 14499)
+++ tlpkg/TeXLive/TLPOBJ.pm (working copy)
@@ -448,6 +448,21 @@
sub cancel_reloc_prefix {
my $self = shift;
my @docfiles = $self->docfiles;
+ for (@docfiles) { s:^$RelocPrefix/::; }
+ $self->docfiles(@docfiles);
+ my @runfiles = $self->runfiles;
+ for (@runfiles) { s:^$RelocPrefix/::; }
+ $self->runfiles(@runfiles);
+ my @srcfiles = $self->srcfiles;
+ for (@srcfiles) { s:^$RelocPrefix/::; }
+ $self->srcfiles(@srcfiles);
+ # if there are bin files they have definitely NOT the
+ # texmf-dist prefix, so we cannot cancel it anyway
+}
+
+sub replace_reloc_prefix {
+ my $self = shift;
+ my @docfiles = $self->docfiles;
for (@docfiles) { s:^$RelocPrefix/:$RelocTree/:; }
$self->docfiles(@docfiles);
my @runfiles = $self->runfiles;
Index: tlpkg/TeXLive/TLMedia.pm
===================================================================
--- tlpkg/TeXLive/TLMedia.pm (revision 14499)
+++ tlpkg/TeXLive/TLMedia.pm (working copy)
@@ -48,6 +48,8 @@
}
if (-d "$location/texmf/web2c") {
$media = 'DVD';
+ } elsif (-d "$location/web2c") {
+ $media = 'DVD';
} elsif (-d "$location/$Archive") {
$media = 'CD';
} else {
@@ -235,8 +237,12 @@
}
# if a package is relocatable we have to cancel the reloc prefix
# before we save it to the local tlpdb
- if ($tlpobj->relocated) {
- $tlpobj->cancel_reloc_prefix;
+ if ($reloc) {
+ if ($totlpdb->setting("usertree")) {
+ $tlpobj->cancel_reloc_prefix;
+ } else {
+ $tlpobj->replace_reloc_prefix;
+ }
}
# we have to write out the tlpobj file since it is contained in the
# archives (.tar.xz) but at DVD install time we don't have them
@@ -305,7 +311,11 @@
} elsif ($what =~ m,\.tar(\.xz)?$,) {
my $type = defined($1) ? "xz" : "tar";
- $target .= "/$TeXLive::TLConfig::RelocTree" if $reloc;
+ if ($reloc) {
+ if (!$totlpdb->setting("usertree")) {
+ $target .= "/$TeXLive::TLConfig::RelocTree" if $reloc;
+ }
+ }
# this is the case when we install from CD or the NET, or a backup
#
@@ -388,6 +398,7 @@
my ($self, $pkg, $nopostinstall) = @_;
my $localtlpdb = $self->tlpdb;
my $tlp = $localtlpdb->get_package($pkg);
+ my $usertree = $localtlpdb->setting("usertree");
if (!defined($tlp)) {
tlwarn ("$pkg: package not present, cannot remove\n");
} else {
@@ -413,9 +424,12 @@
# in user mode we just remove the prefix, in normal mode we
# replace it with texmf-dist
# since we don't have user mode
+
if ($tlp->relocated) {
for (@files) {
- s:^$RelocPrefix/:$RelocTree/:;
+ if (!$usertree) {
+ s:^$RelocPrefix/:$RelocTree/:;
+ }
}
}
#
Index: tlpkg/TeXLive/TLUtils.pm
===================================================================
--- tlpkg/TeXLive/TLUtils.pm (revision 14499)
+++ tlpkg/TeXLive/TLUtils.pm (working copy)
@@ -1187,7 +1187,7 @@
# if a package is relocatable we have to cancel the reloc prefix
# before we save it to the local tlpdb
if ($tlpobj->relocated) {
- $tlpobj->cancel_reloc_prefix;
+ $tlpobj->replace_reloc_prefix;
}
$totlpdb->add_tlpobj($tlpobj);
# we have to write out the tlpobj file since it is contained in the
Index: texmf/scripts/texlive/tlmgr.pl
===================================================================
--- texmf/scripts/texlive/tlmgr.pl (revision 14502)
+++ texmf/scripts/texlive/tlmgr.pl (working copy)
@@ -125,6 +125,8 @@
"machine-readable" => 1,
"package-logfiles" => "=s",
"pause" => 1,
+ "usermode" => 1,
+ "usertree" => "=s",
"version" => 1,
"help|h|?" => 1);
@@ -287,13 +289,30 @@
pod2usage(-msg => $msg, -exitstatus => 1, -verbose => 1, @noperldoc);
}
+ #
+ # the main tree we will be working on
+ $::maintree = $Master;
+ if ($opts{"usermode"}) {
+ # we could also try to detect that we don't have write permissions
+ # and switch to user mode automatically
+ if (defined($opts{"usertree"})) {
+ $::maintree = $opts{"usertree"};
+ } else {
+ chomp($::maintree = `kpsewhich -var-value TEXMFHOME`);
+ }
+ }
+
# besides doing normal logging if -logfile is specified, we try to log
# package related actions (install, remove, update) to
# the package-log file TEXMFSYSVAR/web2c/tlmgr.log
$packagelogged = 0; # how many msgs we logged
chomp (my $texmfsysvar = `kpsewhich -var-value=TEXMFSYSVAR`);
$packagelogfile = $opts{"package-logfile"};
- $packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log";
+ if ($opts{"usermode"}) {
+ $packagelogfile ||= "$::maintree/web2c/tlmgr.log";
+ } else {
+ $packagelogfile ||= "$texmfsysvar/web2c/tlmgr.log";
+ }
#
# Try to open the packagelog file, but do NOT die when that does not work
if (!open(PACKAGELOG, ">>$packagelogfile")) {
@@ -416,6 +435,9 @@
} elsif ($action =~ m/^show$/i) {
action_show();
finish(0);
+ } elsif ($action =~ m/^init-usertree$/i) {
+ action_init_usertree();
+ finish(0);
} elsif ($action =~ m/^remove$/i) {
action_remove();
} elsif ($action =~ /^paper$/) {
@@ -469,6 +491,8 @@
#
sub handle_execute_actions {
+ my $sysmode = ($opts{"usermode"} ? "" : "-sys");
+
my $errors = 0;
if ($::files_changed) {
@@ -501,14 +525,14 @@
}
}
for my $m (keys %do_disable) {
- $errors += do_cmd_and_check("updmap-sys --nomkmap --nohash --disable $m");
+ $errors += do_cmd_and_check("updmap$sysmode --nomkmap --nohash --disable $m");
}
for my $m (keys %do_enable) {
- my $str = "updmap-sys --nomkmap --nohash --enable " .
+ my $str = "updmap$sysmode --nomkmap --nohash --enable " .
$::execute_actions{'enable'}{'maps'}{$m} . "=$m";
$errors += do_cmd_and_check($str);
}
- $errors += do_cmd_and_check("updmap-sys") if $run_full;
+ $errors += do_cmd_and_check("updmap$sysmode") if $run_full;
}
@@ -550,7 +574,7 @@
if ($opt_fmt && !$::regenerate_all_formats) {
for my $f (keys %do_enable) {
log ("(re)creating format dump $f\n");
- $errors += do_cmd_and_check("fmtutil-sys --byfmt $f");
+ $errors += do_cmd_and_check("fmtutil$sysmode --byfmt $f");
$done_formats{$f} = 1;
}
@@ -565,7 +589,7 @@
for my $e (@upen) {
if ($def{'engine'} eq $e) {
log ("updating format $def{'name'} (engine $e updated)\n");
- $errors += do_cmd_and_check("fmtutil-sys --byfmt $def{'name'}");
+ $errors += do_cmd_and_check("fmtutil$sysmode --byfmt $def{'name'}");
$done_formats{$def{'name'}} = 1;
}
}
@@ -607,7 +631,7 @@
$lang = "$TEXMFSYSVAR/tex/generic/config/$lang";
}
if ($localtlpdb->option("create_formats") && !$::regenerate_all_formats) {
- $errors += do_cmd_and_check("fmtutil-sys --byhyphen $lang");
+ $errors += do_cmd_and_check("fmtutil$sysmode --byhyphen $lang");
}
}
}
@@ -616,7 +640,7 @@
#
if ($::regenerate_all_formats) {
info("Regenerating all formats, this may take some time ...");
- $errors += do_cmd_and_check("fmtutil-sys --all");
+ $errors += do_cmd_and_check("fmtutil$sysmode --all");
info("done\n");
$::regenerate_all_formats = 0;
}
@@ -788,8 +812,13 @@
action_gui("config") if $opts{"gui"};
init_local_db();
- chomp(my $texmfsysconfig = `kpsewhich -var-value=TEXMFSYSCONFIG`);
- $ENV{"TEXMFCONFIG"} = $texmfsysconfig;
+ my $texmfconfig;
+ if ($opts{"usermode"}) {
+ chomp($texmfconfig = `kpsewhich -var-value=TEXMFCONFIG`);
+ } else {
+ chomp($texmfconfig = `kpsewhich -var-value=TEXMFSYSCONFIG`);
+ }
+ $ENV{"TEXMFCONFIG"} = $texmfconfig;
my $action = shift @ARGV;
if ($action =~ m/^paper$/i) { # generic paper
@@ -801,14 +830,14 @@
"as in: tlmgr pdftex paper --list\n");
} elsif (!defined($newpaper)) { # tlmgr paper => show all current sizes.
- TeXLive::TLPaper::paper_all($texmfsysconfig,undef);
+ TeXLive::TLPaper::paper_all($texmfconfig,undef);
} elsif ($newpaper !~ /^(a4|letter)$/) { # tlmgr paper junk => complain.
$newpaper = "the empty string" if !defined($newpaper);
tlwarn("tlmgr: expected `a4' or `letter' after paper, not $newpaper\n");
} else { # tlmgr paper {a4|letter} => do it.
- TeXLive::TLPaper::paper_all($texmfsysconfig,$newpaper);
+ TeXLive::TLPaper::paper_all($texmfconfig,$newpaper);
}
} else { # program-specific paper
@@ -822,7 +851,7 @@
# the do_paper progs check for the argument --list, so if given
# restore it to the cmd line.
unshift(@ARGV, "--list") if $opts{"list"};
- TeXLive::TLPaper::do_paper($prog,$texmfsysconfig,@ARGV);
+ TeXLive::TLPaper::do_paper($prog,$texmfconfig,@ARGV);
}
}
@@ -863,13 +892,14 @@
# include arbitrary package in the list of collections, but
# only collectons:
@colls = grep {m;^collection-;} @colls;
- print "Package: ", $tlp->name, "\n";
- print "Category: ", $tlp->category, "\n";
- print "ShortDesc: ", $tlp->shortdesc, "\n" if ($tlp->shortdesc);
- print "LongDesc: ", $tlp->longdesc, "\n" if ($tlp->longdesc);
- print "Installed: ", ($installed ? "Yes" : "No"), "\n";
- print "Revision: ", $tlp->revision, "\n" if ($installed);
- print "Collection: ", @colls, "\n" if (@colls);
+ print "Package: ", $tlp->name, "\n";
+ print "Category: ", $tlp->category, "\n";
+ print "ShortDesc: ", $tlp->shortdesc, "\n" if ($tlp->shortdesc);
+ print "LongDesc: ", $tlp->longdesc, "\n" if ($tlp->longdesc);
+ print "Installed: ", ($installed ? "Yes" : "No"), "\n";
+ print "Revision: ", $tlp->revision, "\n" if ($installed);
+ print "Relocatable: ", ($tlp->relocated ? "Yes" : "No"), "\n";
+ print "Collection: ", @colls, "\n" if (@colls);
if ($opts{"list"}) {
if ($tlp->category eq "Collection" || $tlp->category eq "Scheme") {
# in the case of collections of schemes we list the deps
@@ -933,6 +963,10 @@
# SYMLINKS
#
sub action_path {
+ if ($opts{"usermode"}) {
+ tlwarn("action `path' not supported in usermode!\n");
+ exit 1;
+ }
my $what = shift @ARGV;
if (!defined($what) || ($what !~ m/^(add|remove)$/i)) {
tlwarn("action path needs one argument, either add or remove\n");
@@ -1355,7 +1389,10 @@
# check for updates to tlmgr and die unless either --force or --list or --self
# is given
- my @critical = check_for_critical_updates($localtlpdb, $tlmediatlpdb);
+ my @critical;
+ if (!$opts{"usermode"}) {
+ @critical = check_for_critical_updates($localtlpdb, $tlmediatlpdb);
+ }
my $dry_run_cont = $opts{"dry-run"} && ($opts{"dry-run"} < 0);
if ( !$dry_run_cont && !$opts{"self"} && @critical) {
critical_updates_warning();
@@ -1787,7 +1824,8 @@
if ($opts{"backup"} && !$opts{"dry-run"}) {
$tlp->make_container("xz", $root,
- $opts{"backupdir"}, "${pkg}.r" . $tlp->revision);
+ $opts{"backupdir"}, "${pkg}.r" . $tlp->revision,
+ $tlp->relocated);
$unwind_package =
"$opts{'backupdir'}/${pkg}.r" . $tlp->revision . ".tar.xz";
@@ -1990,16 +2028,18 @@
init_tlmedia();
# check for updates to tlmgr itself, and die unless --force is given
- if (check_for_critical_updates( $localtlpdb, $tlmediatlpdb)) {
- critical_updates_warning();
- if ($opts{"force"}) {
- tlwarn("Continuing due to --force\n");
- } else {
- if ($::gui_mode) {
- # return here and don't do any updates
- return;
+ if (!$opts{"usermode"}) {
+ if (check_for_critical_updates( $localtlpdb, $tlmediatlpdb)) {
+ critical_updates_warning();
+ if ($opts{"force"}) {
+ tlwarn("Continuing due to --force\n");
} else {
- die "tlmgr: Not continuing, please see warning above!\n";
+ if ($::gui_mode) {
+ # return here and don't do any updates
+ return;
+ } else {
+ die "tlmgr: Not continuing, please see warning above!\n";
+ }
}
}
}
@@ -2036,6 +2076,15 @@
}
}
foreach my $pkg (@inst_packs, @inst_colls, @inst_schemes) {
+ my $tlp = $tlmediasrc->tlpdb->get_package($pkg);
+ if (!defined($tlp)) {
+ info("Unknown package $pkg\n");
+ next;
+ }
+ if (!$tlp->relocated && $opts{"usermode"}) {
+ info("Package $pkg is not relocatable, cannot install it in user mode!\n");
+ next;
+ }
my $re = "";
if (defined($localtlpdb->get_package($pkg))) {
if ($opts{"reinstall"}) {
@@ -2241,6 +2290,10 @@
if ($^O=~/^MSWin(32|64)$/i) {
warn("action `arch' not supported on Windows\n");
}
+ if ($opts{"usermode"}) {
+ tlwarn("action `arch' not supported in usermode\n");
+ exit 1;
+ }
if ($opts{"gui"}) {
action_gui("arch");
}
@@ -2322,6 +2375,10 @@
# GENERATE
#
sub action_generate {
+ if ($opts{"usermode"}) {
+ tlwarn("action `generate' not supported in usermode!\n");
+ exit 1;
+ }
my $dest = defined($opts{"dest"}) ? $opts{"dest"} : "";
my $localconf = defined($opts{"localcfg"}) ? $opts{"localcfg"} : "";
my $what = shift @ARGV;
@@ -3121,6 +3178,34 @@
#
+# action init_user_tree
+# sets up TEXMFHOME or --usertree argument for user mode tlmgr
+# by creating a minimal tlpdb
+#
+sub action_init_usertree {
+ init_local_db();
+ my $tlpdb = TeXLive::TLPDB->new;
+ my $usertree;
+ if ($opts{"usertree"}) {
+ $usertree = $opts{"usertree"};
+ } else {
+ chomp($usertree = `kpsewhich -var-value TEXMFHOME`);
+ }
+ $tlpdb->root($usertree);
+ my $inst = TeXLive::TLPOBJ->new;
+ $inst->name("00texlive.installation");
+ $inst->category("TLCore");
+ my @deps;
+ push @deps, "opt_location:$location";
+ push @deps, "setting_available_architectures:";
+ push @deps, "setting_usertree:1";
+ $inst->depends(@deps);
+ $tlpdb->add_tlpobj($inst);
+ $tlpdb->save;
+}
+
+
+#
# action conf
# tries to mimick texconfig conf but probably will add some more things
#
@@ -3184,10 +3269,10 @@
# stuff changed via the GUI
return if defined $localtlmedia;
return if defined $localtlpdb;
- $localtlmedia = TeXLive::TLMedia->new ( $Master );
- die("cannot setup TLMedia in $Master") unless (defined($localtlmedia));
+ $localtlmedia = TeXLive::TLMedia->new ( $::maintree );
+ die("cannot setup TLMedia in $::maintree") unless (defined($localtlmedia));
$localtlpdb = $localtlmedia->tlpdb;
- die("cannot find tlpdb in $Master") unless (defined($localtlpdb));
+ die("cannot find tlpdb in $::maintree") unless (defined($localtlpdb));
# setup the programs, for w32 we need the shipped wget/xz etc, so we
# pass the location of these files to setup_programs.
if (!setup_programs("$Master/tlpkg/installer", $localtlmedia->platform)) {
|