summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin/tl-update-nsis
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/bin/tl-update-nsis')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-nsis12
1 files changed, 4 insertions, 8 deletions
diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis
index a1acbd56ebc..78ef875db99 100755
--- a/Master/tlpkg/bin/tl-update-nsis
+++ b/Master/tlpkg/bin/tl-update-nsis
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008 Norbert Preining
+# Copyright 2008, 2009 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
@@ -40,13 +40,9 @@ sub main
chomp (my $Master = `cd $mydir/../.. && pwd`);
my $tlpdb = TeXLive::TLPDB->new ("root" => $Master);
die("Cannot find tlpdb in $Master\n") unless defined($tlpdb);
- my $bintexlive = $tlpdb->get_package("bin-texlive");
- my $bintexlivew32 = $tlpdb->get_package("bin-texlive.win32");
my $texliveinfra = $tlpdb->get_package("texlive.infra");
my $texliveinfraw32 = $tlpdb->get_package("texlive.infra.win32");
my @allfiles = ();
- push @allfiles, $bintexlive->all_files;
- push @allfiles, $bintexlivew32->all_files if defined $bintexlivew32;
push @allfiles, $texliveinfra->all_files;
push @allfiles, $texliveinfraw32->all_files if defined $texliveinfraw32;
@@ -58,7 +54,7 @@ sub main
$removetlpobjdir = 1;
}
my $rev = 0; # we want the highest rev all these packages.
- for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
+ for my $p ($texliveinfra, $texliveinfraw32) {
if (defined $p) {
if ($p->revision > $rev) {
$rev = $p->revision;
@@ -95,7 +91,7 @@ Page instfiles
Name "TeX Live Manager Update ${REV}"
OutFile "update-tlmgr-${REV}.exe"
-InstallDir "$PROGRAMFILES\texlive\2008"
+InstallDir "$PROGRAMFILES\texlive\$TeXLive::TLConfig::ReleaseYear"
RequestExecutionLevel "user"
@@ -135,7 +131,7 @@ EOF
}
}
print " ExecWait \'\"\$INSTDIR\\bin\\win32\\tlmgr.bat\" _include_tlpobj";
- for my $p ($bintexlive, $bintexlivew32, $texliveinfra, $texliveinfraw32) {
+ for my $p ($texliveinfra, $texliveinfraw32) {
if (defined $p) {
print " \"\$INSTDIR\\tlpkg\\tlpobj\\", $p->name, ".tlpobj\"";
}