summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-11-05 14:43:01 +0000
committerKarl Berry <karl@freefriends.org>2008-11-05 14:43:01 +0000
commit9b9d15dfc79274a08f96f72a6f1e2e0258fec2d9 (patch)
tree7e4799f8e7aec8dbd0809df520a5faf65f477961
parent21975be87eeabf2bf62f15d87501167e8d6747e7 (diff)
stable exit status for tl-update-nsis
git-svn-id: svn://tug.org/texlive/trunk@11191 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-update-nsis15
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlcritical6
2 files changed, 12 insertions, 9 deletions
diff --git a/Master/tlpkg/bin/tl-update-nsis b/Master/tlpkg/bin/tl-update-nsis
index 1fa0b3b15f4..ed26bd28550 100755
--- a/Master/tlpkg/bin/tl-update-nsis
+++ b/Master/tlpkg/bin/tl-update-nsis
@@ -25,12 +25,12 @@ use Pod::Usage;
use File::Path;
use Cwd;
-my $help = 0;
+my $opt_help = 0;
TeXLive::TLUtils::process_logging_options();
GetOptions("help|?" => \$help) or pod2usage(1);
-pod2usage(-exitstatus => 0, -verbose => 2) if $help;
+pod2usage(-exitstatus => 0, -verbose => 2) if $opt_help;
exit (&main ());
@@ -146,19 +146,20 @@ EOF
}
}
print "'\nSectionEnd\n";
+
+ return 0;
}
-
__END__
=head1 NAME
-tl-create-nsis - creates a .nsi file for bin-texlive and texlive.infra
+tl-update-nsis - creates a .nsi file for tlmgr packages
=head1 SYNOPSIS
-tl-create-nsis [OPTION]...
+tl-update-nsis [OPTION]...
=head1 OPTIONS
@@ -170,7 +171,9 @@ function in L<TeXLive::TLUtils> for details.
Creates a C<.nsi> file that can be used with NSIS to create an update
executable for Windows, to work around Windows' inability to overwrite
-open files.
+open files, and for disaster recovery. It contains the tlmgr-related
+infrastructure files. L<http://tug.org/texlive/tlmgr.html> explains
+more.
=head1 AUTHORS AND COPYRIGHT
diff --git a/Master/tlpkg/bin/tl-update-tlcritical b/Master/tlpkg/bin/tl-update-tlcritical
index 6023d23002a..f868ad0f92d 100755
--- a/Master/tlpkg/bin/tl-update-tlcritical
+++ b/Master/tlpkg/bin/tl-update-tlcritical
@@ -22,8 +22,8 @@ mv -v update-*.sh $tlcrit
(cd $tlcrit && ln -sv update-*.sh update-tlmgr-latest.sh)
# update the Windows updater executable.
-$mydir/tl-update-nsis >updater.nsi
-makensis updater.nsi >/tmp/makensis.log
-rm -f $tlcrit/update-*.exe updater.nsi
+$mydir/tl-update-nsis >/tmp/updater.nsi
+makensis /tmp/updater.nsi >/tmp/makensis.log
+rm -f $tlcrit/update-*.exe /tmp/updater.nsi
mv -v update-*.exe $tlcrit
(cd $tlcrit && ln -sv update-*.exe update-tlmgr-latest.exe)