summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-10-25 17:04:44 +0000
committerKarl Berry <karl@freefriends.org>2008-10-25 17:04:44 +0000
commit61a08759b9f638a80f201a5cda937384fabfba21 (patch)
tree3599993d155afc1837824c7ba5409deada1c4620
parentfea34ae4a52cd4cc3f7a82061c63165c9dc74dfe (diff)
restore tlmgr to bin-texlive, and make bin-texlive critical again, in hopes that updates from an iso installation will work again
git-svn-id: svn://tug.org/texlive/trunk@11048 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers2
-rw-r--r--Master/tlpkg/tlpsrc/bin-texlive.tlpsrc11
-rw-r--r--Master/tlpkg/tlpsrc/texlive.infra.tlpsrc16
3 files changed, 17 insertions, 12 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index c78a9cd5eb9..21817052217 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -24,7 +24,7 @@ use Pod::Usage;
use File::Path;
# packages matching these re's will not be updated without --all.
-my @critical_pkg_list = qw/texlive\.infra texlive-en/;
+my @critical_pkg_list = qw/bin-texlive texlive\.infra texlive-en/;
our ($mydir, $vc_id);
my $opt_all = 0;
diff --git a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
index ac286369689..4f1a54210fd 100644
--- a/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
+++ b/Master/tlpkg/tlpsrc/bin-texlive.tlpsrc
@@ -2,6 +2,17 @@ name bin-texlive
category TLCore
shortdesc executables and files maintained as part of TeX Live
depend texlive.infra
+runpattern f texmf/fmtutil/fmtutil-hdr.cnf
+runpattern d texmf/scripts/texlive/lua
+runpattern d texmf/scripts/texlive/tlmgrgui
runpattern f texmf/scripts/texlive/rungs.tlu
+runpattern f texmf/scripts/texlive/test-tlpdb.tlu
+runpattern f texmf/scripts/texlive/texconf.tlu
+runpattern f texmf/scripts/texlive/tlmgr.pl
+runpattern f texmf/scripts/texlive/uninstall-win32.pl
+runpattern f texmf/web2c/updmap-hdr.cfg
+docpattern f texmf/doc/man/man1/tlmgr.*
+binpattern f bin/${ARCH}/tlmgr
binpattern f bin/${ARCH}/rungs
+binpattern f bin/win32/tl-w32-wrapper.texlua
binpattern f bin/win32/symlinks4cygwin.sh
diff --git a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
index dc121c7445f..4505f2b5fa1 100644
--- a/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
+++ b/Master/tlpkg/tlpsrc/texlive.infra.tlpsrc
@@ -20,14 +20,6 @@ runpattern f doc.html
runpattern f index.html
runpattern f release-texlive.txt
runpattern f tlpkg/installer/wgetrc
-runpattern f texmf/fmtutil/fmtutil-hdr.cnf
-runpattern d texmf/scripts/texlive/lua
-runpattern d texmf/scripts/texlive/tlmgrgui
-runpattern f texmf/scripts/texlive/test-tlpdb.tlu
-runpattern f texmf/scripts/texlive/texconf.tlu
-runpattern f texmf/scripts/texlive/tlmgr.pl
-runpattern f texmf/scripts/texlive/uninstall-win32.pl
-runpattern f texmf/web2c/updmap-hdr.cfg
#
binpattern f/win32 tlpkg/installer/tar.exe
binpattern f/win32 tlpkg/installer/lzma/lzmadec.win32.exe
@@ -35,6 +27,8 @@ binpattern f/win32 tlpkg/installer/lzma/lzma.exe
binpattern f/win32 tlpkg/installer/wget/wget.exe
binpattern f tlpkg/installer/lzma/lzmadec.${ARCH}
binpattern f tlpkg/installer/lzma/lzma.${ARCH}
-binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,powerpc-linux,i386-freebsd,x86_64-linux tlpkg/installer/wget/wget.${ARCH}
-binpattern f bin/${ARCH}/tlmgr
-binpattern f bin/win32/tl-w32-wrapper.texlua
+# we count on lots of platforms providing their own wget.
+binpattern f/!i386-solaris,i386-linux,mips-irix,sparc-linux,alpha-linux,\
+powerpc-linux,i386-freebsd,x86_64-linux \
+ tlpkg/installer/wget/wget.${ARCH}
+