diff options
| -rwxr-xr-x | Master/tlpkg/bin/tl-makeself-from-tlnet | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet index 1ed089c93cf..4d99e519777 100755 --- a/Master/tlpkg/bin/tl-makeself-from-tlnet +++ b/Master/tlpkg/bin/tl-makeself-from-tlnet @@ -116,23 +116,23 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then echo "$0: proceeding with tlmgr update." fi - # move the architecture-specific files to the top level. + # move the architecture-specific files away so we don't blindly copy + # them all. The loop below and tlmgr invocation at the end will update. mv ./master/bin . mkdir ./installer mv ./master/tlpkg/installer/xz ./installer - mv ./master/tlpkg/installer/lz4 ./installer mv ./master/tlpkg/installer/wget ./installer + mv ./master/tlpkg/installer/lz4 ./installer # could be anywhere # install the architecture-independent files. (cd master && tar cf - *) | (cd "$ROOT" && tar xf -) || exit 1 t_instdir=$ROOT/tlpkg/installer # target installer dir t_xzdir=$t_instdir/xz - t_lz4dir=$t_instdir/lz4 t_wgetdir=$t_instdir/wget # # ensure these target directories exist. - mkdir -p "$t_xzdir" "$t_lz4dir" "$t_wgetdir" + mkdir -p "$t_xzdir" "$t_wgetdir" # Start the list of tlpobjs we will install with the # platform-independent part of the infrastructure package. @@ -155,10 +155,8 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then # install the bin dir for this platform. (cd bin && tar cf - "$b") | (cd "$ROOT/bin" && tar xf -) || exit 1 - # copy the installer binaries; not everything provides wget or lz4. + # copy the installer binaries; not everything provides wget. cp installer/xz/xz."$b" "$t_xzdir/" || exit 1 - test -r installer/lz4/lz4.$b \ - && { cp installer/lz4/lz4.$b "$t_lz4dir/" || exit 1; } test -r installer/wget/wget.$b \ && { cp installer/wget/wget.$b "$t_wgetdir/" || exit 1; } done |