diff options
Diffstat (limited to 'Master/tlpkg/bin/tl-update-nsis')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-nsis | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis index 558237169f4..412128dbeb1 100755 --- a/Master/tlpkg/bin/tl-update-nsis +++ b/Master/tlpkg/bin/tl-update-nsis @@ -45,7 +45,6 @@ sub main my $texliveinfra = $tlpdb->get_package("texlive.infra"); my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32"); my %dirtofiles; - my $tlpobjdir = "$InfraLocation/tlpobj"; my @allfiles; push @allfiles, $bintexlive->all_files; push @allfiles, $bintexlivew32->all_files if defined $bintexlivew32; @@ -58,15 +57,15 @@ sub main $rev = ( $rev > $texliveinfra->revision ? $rev : $texliveinfra->revision ); $rev = ( $rev > $texliveinfraw32->revision ? $rev : $texliveinfraw32->revision ); # we have to create the tlpobj files, too - chdir($Master); + my $tlpobjdir = "$InfraLocation/tlpobj"; my $removetlpobjdir = 0; - if (! -d "$tlpobjdir") { - &TeXLive::TLUtils::mkdirhier("$tlpobjdir"); + if (! -d "$Master/$tlpobjdir") { + &TeXLive::TLUtils::mkdirhier("$Master/$tlpobjdir"); $removetlpobjdir = 1; } for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) { if (defined $p) { - open(TMP,">$tlpobjdir/$p->{'name'}.tlpobj") or die "Cannot create $tlpobjdir/$p->{'name'}.tlpobj"; + open(TMP,">$Master/$tlpobjdir/$p->{'name'}.tlpobj") or die "Cannot create $Master/$tlpobjdir/$p->{'name'}.tlpobj"; $p->writeout(\*TMP); close(TMP); push @allfiles, "$tlpobjdir/$p->{'name'}.tlpobj"; @@ -124,13 +123,15 @@ Section "MainGroup" #SetOutPath "$INSTDIR" #File /r tlupdates\*.* EOF + my $mm = $Master; + $mm =~ s!/!\\!g; for my $d (keys %dirtofiles) { my $dd = $d; $dd =~ s!/!\\!g; print " SetOutPath \"\$INSTDIR\\$dd\"\n"; for my $f (@{$dirtofiles{$d}}) { $f =~ s!/!\\!g; - print " File $dd\\$f\n"; + print " File $mm\\$dd\\$f\n"; } } print <<'EOF'; |