summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-05-25 23:51:16 +0000
committerKarl Berry <karl@freefriends.org>2010-05-25 23:51:16 +0000
commit3ace2485d410c75ff6c6a53d4918b435f471021a (patch)
tree68e45a9c5f78b5f5ca8038341ed849b2ec013bfb /Master/tlpkg
parentc7fed993f019060c4227f8ecbb92d9d2a706eeea (diff)
Assorted unrelated but small changes.
TLConfig.pm: set autobackup default to 1. 00texlive.installation.tlpsrc: doc fixes. check-wrapper-consistency: do not check context w32 executables. tl-update-images: enable full image rebuild. install-tl: MANPATH msg. tlmgr.pl: qualify which() call. spanish.pdf: broken and removed on CTAN. git-svn-id: svn://tug.org/texlive/trunk@18496 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLConfig.pm2
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-images25
-rw-r--r--Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc10
4 files changed, 17 insertions, 22 deletions
diff --git a/Master/tlpkg/TeXLive/TLConfig.pm b/Master/tlpkg/TeXLive/TLConfig.pm
index a3b394f8fb6..f3b271ee81f 100644
--- a/Master/tlpkg/TeXLive/TLConfig.pm
+++ b/Master/tlpkg/TeXLive/TLConfig.pm
@@ -126,7 +126,7 @@ our %TLPDBConfigs = (
our %TLPDBOptions = (
"autobackup" =>
- [ "n:-1..", 0, "autobackup",
+ [ "n:-1..", 1, "autobackup",
"Number of backups to keep" ],
"backupdir" =>
[ "p", "", "backupdir",
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index 989016f3ced..82154eb4880 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -97,7 +97,7 @@ sub check_w32
for my $k (sort keys %uw) {
my $target = $uw{$k};
next if $target =~ /bibexport/; # shell script
- # next if $target =~ /context/; # will have its own stubs
+ next if $target =~ /context/; # does it its own way
next if $target =~ /dviout/; # gui stub
next if $target =~ /listings-ext/; # shell script
next if $target =~ /man/; # no symlink
diff --git a/Master/tlpkg/bin/tl-update-images b/Master/tlpkg/bin/tl-update-images
index 369d8fc26a4..daac83db526 100755
--- a/Master/tlpkg/bin/tl-update-images
+++ b/Master/tlpkg/bin/tl-update-images
@@ -100,29 +100,28 @@ MAKEINST ()
cd $imgdir || exit 1
rm doc.html tlpkg/texlive.tlpdb.xz
- #mkisofs $common_mkisofs_options -o $iso .
-false # xxdebug
+ mkisofs $common_mkisofs_options -o $iso .
rm -rf $imgdir
# also make compressed version, helps people downloading test images.
# this takes two hours or so, so write to a temp file and then rename.
- xz -9 -v <$live_iso >$live_iso.xz.part
- mv $live_iso.xz.part $live_iso.xz
+ xz -9 -v <$iso >$iso.xz.part
+ mv $iso.xz.part $iso.xz
# make checksums
# and symlinks with short names (potentially used in /etc/fstab).
for ext in "" .xz; do
rm -f $prefix.iso$ext $prefix.iso$ext.md5 $prefix.iso$ext.sha256
- (cd $target && md5sum `basename $live_iso$ext`) >$live_iso$ext.md5
- (cd $target && sha256sum `basename $live_iso$ext`) >$live_iso$ext.sha256
+ (cd $target && md5sum `basename $iso$ext`) >$iso$ext.md5
+ (cd $target && sha256sum `basename $iso$ext`) >$iso$ext.sha256
- ln -s `basename $live_iso$ext` $prefix.iso$ext
- ln -s `basename $live_iso`$ext.md5 $prefix.iso$ext.md5
- ln -s `basename $live_iso`$ext.sha256 $prefix.iso$ext.sha256
+ ln -s `basename $iso$ext` $prefix.iso$ext
+ ln -s `basename $iso`$ext.md5 $prefix.iso$ext.md5
+ ln -s `basename $iso`$ext.sha256 $prefix.iso$ext.sha256
- ls -l $live_iso$ext
+ ls -l $iso$ext
done
}
@@ -156,7 +155,6 @@ do_tar ()
MAKETAR ()
{
-false # xxdebug
# remove old tarballs and checksums.
rm -f $target/$NAME-*.tar.*
@@ -178,13 +176,12 @@ false # xxdebug
# main program.
# Add our exact version to the release file.
-#printf "\ntexlive-$D\n" >>$master/release-texlive.txt
+printf "\ntexlive-$D\n" >>$master/release-texlive.txt
$makeinst && MAKEINST
$maketar && MAKETAR
-#$makelive && MAKELIVE
# Undo the version.
-#svn revert $master/release-texlive.txt
+svn revert $master/release-texlive.txt
exit 0
diff --git a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
index 0d1bacb8113..280c443fd4e 100644
--- a/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
+++ b/Master/tlpkg/tlpsrc/00texlive.installation.tlpsrc
@@ -9,11 +9,9 @@ longdesc 2. on an installed system it serves as a configuration file.
longdesc We have to remember these settings for additional package
longdesc installation, removal, etc.
longdesc
-longdesc In the tlpsrc itself only those options are saved that are used *ONLY*
-longdesc at installation time, currently opt_paper, opt_path, opt_frozen,
-longdesc and opt_write18_restricted.
-longdesc These will longdesc be saved in the local tlpdb and will not be
-longdesc accessible by tlmgr.
+longdesc In this tlpsrc, the only options listed are those that are used
+longdesc *ONLY* at installation time. These are saved in the local
+longdesc tlpdb and will not be accessible by tlmgr.
longdesc
longdesc All other options are set from TLConfig::TLPDBOptions to the
longdesc default values specified there.
@@ -36,7 +34,7 @@ longdesc installer to use the present directory itself. For example,
longdesc the DVD can be mounted anywhere and we want the installer to work.
longdesc
longdesc Concerning the 00* names:
-longdesc All packages starting with 00texlive are considered virtual packages
+longdesc All packages starting with 00texlive are ``virtual packages'',
longdesc in the sense that no containers are generated and these packages
longdesc are never split into .src and .doc sub-packages in the tlpdb.