summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-06-28 22:44:42 +0000
committerKarl Berry <karl@freefriends.org>2018-06-28 22:44:42 +0000
commit3a144d28444d845832bb471ab7ccacd1adac54e8 (patch)
tree211992f8ca20e0ce2c2ff522b1d246d9841ed3a4
parentf84ad68091d24f72d878a47af2c7aedf859be453 (diff)
(runme.sh): copy xz*.exe for cygwin. Report from
Adam Maxwell, 27 Jun 2018 18:56:18. git-svn-id: svn://tug.org/texlive/trunk@48109 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-makeself-from-tlnet22
1 files changed, 17 insertions, 5 deletions
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet
index 4d99e519777..f0b393f63cf 100755
--- a/Master/tlpkg/bin/tl-makeself-from-tlnet
+++ b/Master/tlpkg/bin/tl-makeself-from-tlnet
@@ -25,7 +25,7 @@ fi
ARCHIVE=$TLNET/archive
if test ! -d "$ARCHIVE"; then
- echo "$0: subdirectory archive/ in $TLNET not found, aborting." >&2
+ echo "$0: Subdirectory archive/ in $TLNET not found, aborting." >&2
exit 1
fi
@@ -33,7 +33,7 @@ fi
NETRELEASE=`sed -n 's!^depend release/!!p' "$TLNET/tlpkg/texlive.tlpdb"`
MINRELEASE=`sed -n 's!^depend minrelease/!!p' "$TLNET/tlpkg/texlive.tlpdb"`
if test -z "$NETRELEASE" || test -z "$MINRELEASE"; then
- echo "$0: could not find release or minrease from $TLNET/tlpkg/texlive.tlpdb"\
+ echo "$0: could not find (min)release in $TLNET/tlpkg/texlive.tlpdb, bye"\
>&2; exit 1
fi
@@ -144,10 +144,11 @@ if test -r "$ROOT/tlpkg/texlive.tlpdb" && test -d "$ROOT/tlpkg/tlpobj/"; then
src_tlpobj=master/tlpkg/tlpobj
tlpobjs=$src_tlpobj/$infrapkg.tlpobj
- # for each platform directory of binaries
+ # for each installed directory of binaries
for a in "$ROOT"/bin/*; do
test -d "$a" || continue # skip any cruft files
b=`basename "$a"` # just the architecture name
+ echo "$0: updating $a..."
# add the tlpobjs for this platform to the list.
tlpobjs="$tlpobjs $src_tlpobj/$infrapkg.$b.tlpobj"
@@ -155,8 +156,19 @@ 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.
- cp installer/xz/xz."$b" "$t_xzdir/" || exit 1
+ # copy the xz binaries, sometimes with .exe, for Cygwin.
+ if test -r installer/xz/xz."$b"; then
+ cp installer/xz/xz."$b" "$t_xzdir/" || exit 1
+ elif test -r installer/xz/xz."$b".exe; then
+ cp installer/xz/xz."$b".exe "$t_xzdir/" || exit 1
+ else
+ echo "$0: no xz.$b[.exe] binary for $a in `pwd`/installer/xz." >&2
+ ls installer/xz >&2
+ exit 1
+ fi
+ #
+ # Cygwin (among others) does not need to provide wget, so don't
+ # worry about .exe here.
test -r installer/wget/wget.$b \
&& { cp installer/wget/wget.$b "$t_wgetdir/" || exit 1; }
done