diff options
| author | Karl Berry <karl@freefriends.org> | 2013-05-10 17:48:09 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-05-10 17:48:09 +0000 |
| commit | 650b657b19832c68d26e14726af630f1bc52b0f5 (patch) | |
| tree | 5db611ac5e20b56511c3044a2ca34dbbbed860f6 /Master/tlpkg | |
| parent | 41a6f0f2902b79df03ced7409cb563a744fa36b1 (diff) | |
* dev/srclist.txt: check for xdvipdfmx's dvipdfmx.cfg being in sync, too.
* bin/tl-update-bindir: cd as deep as necessary.
* install/texlive.png: update for 2013.
git-svn-id: svn://tug.org/texlive/trunk@30371 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-bindir | 7 | ||||
| -rw-r--r-- | Master/tlpkg/dev/srclist.txt | 1 | ||||
| -rw-r--r-- | Master/tlpkg/installer/texlive.png | bin | 17073 -> 33495 bytes |
3 files changed, 5 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir index 98a1e46b86f..d5f016ba129 100755 --- a/Master/tlpkg/bin/tl-update-bindir +++ b/Master/tlpkg/bin/tl-update-bindir @@ -205,7 +205,7 @@ for tlname in $tlnames; do fi $msg "installing from $bin_loc to $destdir via $tmpdir" - ls -l "$bin_loc" + ls -ld "$bin_loc" # if we were given a tar file, unpack it. if test -f "$bin_loc"; then @@ -229,8 +229,9 @@ for tlname in $tlnames; do find "$srcdir" -name .svn | xargs rm -rf # may need to cd into a subdirectory, depending on how the tar was made. - test "`ls $srcdir`" != bin || srcdir=$srcdir/bin - test `ls $srcdir | wc -l` != 1 || srcdir=$srcdir/* + while test `ls $srcdir | wc -l` = 1; do + srcdir=$srcdir/* + done # destdir is what is in the repo now, srcdir has the new binaries. (cd $destdir && ls) >$tmpdir/now diff --git a/Master/tlpkg/dev/srclist.txt b/Master/tlpkg/dev/srclist.txt index a35a81a1e6a..d7166a2cc78 100644 --- a/Master/tlpkg/dev/srclist.txt +++ b/Master/tlpkg/dev/srclist.txt @@ -34,6 +34,7 @@ Build/source/texk/dvipdfmx/data/pdfglyphlist.txt Master/texmf-dist/fonts/map/gly # dvipdfmx is maintained as part of TL now, so keep config files the same. Build/source/texk/dvipdfmx/data/dvipdfmx.cfg Master/texmf-dist/dvipdfmx/dvipdfmx.cfg +Build/source/texk/dvipdfmx/data/dvipdfmx.cfg Build/source/texk/xdvipdfmx/data/dvipdfmx.cfg # Should be committed at the same time due to Id expansion; seems preferable? Build/source/texk/texlive/w32_wrapper/runscript.tlu Master/bin/win32/runscript.tlu diff --git a/Master/tlpkg/installer/texlive.png b/Master/tlpkg/installer/texlive.png Binary files differindex 61041d8b238..a753da9b7cc 100644 --- a/Master/tlpkg/installer/texlive.png +++ b/Master/tlpkg/installer/texlive.png |
