diff options
| author | Karl Berry <karl@freefriends.org> | 2012-05-15 23:26:55 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2012-05-15 23:26:55 +0000 |
| commit | d5e86badd7c1f723fc85bcb8851a5ccda488f9a3 (patch) | |
| tree | 5a26bd9560efd78492fe43a21846eeb4be15a440 /Master/tlpkg | |
| parent | 21ce5eeed6e0c65bba85f3830d88e34c797a26eb (diff) | |
more generic output grep; omit japanese tfms again; kfreebsd url change
git-svn-id: svn://tug.org/texlive/trunk@26418 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
| -rwxr-xr-x | Master/tlpkg/bin/check-files-by-format | 3 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 4 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 7 |
3 files changed, 7 insertions, 7 deletions
diff --git a/Master/tlpkg/bin/check-files-by-format b/Master/tlpkg/bin/check-files-by-format index 9ac4fb1e29c..5a49ff6c212 100755 --- a/Master/tlpkg/bin/check-files-by-format +++ b/Master/tlpkg/bin/check-files-by-format @@ -15,7 +15,7 @@ # Formats that might be added: # - afm with (afm2pl?) # -# Manuel P\'egouri\'e-Gonnard, 2010. WTFPL v2. +# Manuel P\'egouri\'e-Gonnard, 2010-2012. WTFPL v2. use warnings; use File::Basename; @@ -156,6 +156,7 @@ my $exclude_tfm = { '*base*' => 'texmf-dist/fonts/tfm', 'public/gfsbodoni/' => 1, 'public/malayalam/' => 1, 'public/japanese-otf/' => 1, # japanese tfm's + 'public/japanese-otf-uptex/' => 1, # japanese tfm's 'public/wnri/' => 1, 'public/wsuipa/' => 1, }; diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index c17546998d5..1569e733c3b 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -109,7 +109,7 @@ for tlname in $tlnames; do download_loc=$tmpdir/tl.$tlname.tar.xz default_bin_loc=$download_loc grab="$download -O $download_loc" - $grab ftp://ftp.cea.fr/incoming/y2k01/texlive2011/x86_64-unknown-kfreebsd8.2-gnu.tar.bz2;; + $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/x86_64-unknown-kfreebsd9.0-gnu.tar.xz;; hppa-hpux) default_bin_loc=$download_loc $grab http://www.jtartlabs.com/test/hppa2.0-hp-hpux10.20.tar.gz;; @@ -125,7 +125,7 @@ for tlname in $tlnames; do download_loc=$tmpdir/tl.$tlname.tar.xz default_bin_loc=$download_loc grab="$download -O $download_loc" - $grab ftp://ftp.cea.fr/incoming/y2k01/texlive2011/i686-unknown-kfreebsd8.2-gnu.tar.bz2;; + $grab ftp://ftp.cea.fr/incoming/y2k01/braslau/i386-unknown-kfreebsd9.0-gnu.tar.xz;; i386-linux) default_bin_loc=/home/texlive/sarge/tmp/source/inst/bin/i686-pc-linux-gnu;; i386-netbsd) diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index e2c5d2446ec..9ddbad1fe04 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -161,10 +161,9 @@ unexpected_output=`cat install.log \ | grep -Ev '^Logfile: ' \ | grep -Ev '^Time used for installing ' \ | grep -Ev '^setting up ConTeXt MkIV cache ' \ - | grep -Ev '^resolvers +\| ' \ - | grep -Ev '^system +\| ' \ - | grep -Ev '^mtxrun +\|$' \ - | grep -Ev '^mtxrun +\| runtime:' \ + | grep -Ev '^resolvers +\|' \ + | grep -Ev '^system +\|' \ + | grep -Ev '^mtxrun +\|' \ | grep -Ev '^done$' \ | cat` |