summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-11-18 23:32:06 +0000
committerKarl Berry <karl@freefriends.org>2023-11-18 23:32:06 +0000
commita6418a0cd9a58a10a16c76aa25d16c67b78f2bbe (patch)
treee0ad2c734924f921cc5c6709033444dfd535eae6
parent2a9df9dfa26bbb66de871acbd6d1de85394f44ee (diff)
* tl-makeself-from-tlnet: use new makeself to avoid unnecessary hard
links in embedded archive. https://tug.org/pipermail/tlu/2023-November/000639.html * tl-try-makeself: --noprogress. git-svn-id: svn://tug.org/texlive/trunk@68895 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-makeself-from-tlnet8
-rwxr-xr-xMaster/tlpkg/bin/tl-try-makeself4
2 files changed, 8 insertions, 4 deletions
diff --git a/Master/tlpkg/bin/tl-makeself-from-tlnet b/Master/tlpkg/bin/tl-makeself-from-tlnet
index 1b0b71a3ba9..723b41efa4c 100755
--- a/Master/tlpkg/bin/tl-makeself-from-tlnet
+++ b/Master/tlpkg/bin/tl-makeself-from-tlnet
@@ -249,8 +249,12 @@ chmod ugo+x runme.sh
# make the self-extracting archive back in the directory from which
# we were invoked.
cd "$CWD"
-makeself -q \
- --header $mydir/../libexec/makeself-header.sh \
+
+# we must use the non-distro (Alma Linux 8) version of makeself, because
+# that happened to have a bug causing unnecessary hard links to end up
+# in the archive, which bsdtar (aka macOS) fails on.
+# https://tug.org/pipermail/tlu/2023-November/000639.html
+/usr/local/share/makeself/makeself.sh -q --keep-umask \
$TMP \
update-tlmgr-r$infrarev.sh \
"TeX Live Manager Updater" \
diff --git a/Master/tlpkg/bin/tl-try-makeself b/Master/tlpkg/bin/tl-try-makeself
index 386873ae687..c7799589d05 100755
--- a/Master/tlpkg/bin/tl-try-makeself
+++ b/Master/tlpkg/bin/tl-try-makeself
@@ -18,7 +18,7 @@ rm -rf "$testdir"
mkdir "$testdir"
rsync -a "$lc"/{archive,tlpkg} "$testdir"
-cd "$testdir" # because tl-makeself outputs to the current directory
+cd "$testdir" # because tl-makeself-* outputs to the current directory
rm -f update*sh # remove previous attempts
tl-makeself-from-tlnet "$testdir"
ls -l "$testdir"
@@ -30,4 +30,4 @@ cd "$tl"
# Now try running the updater in the installed tree.
PATH=$tl/bin/x86_64-linux:/usr/bin
-"$testdir"/update-tlmgr-r*.sh #-- --debug
+"$testdir"/update-tlmgr-r*.sh --noprogress #-- --debug