diff options
author | Karl Berry <karl@freefriends.org> | 2020-05-17 17:17:18 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2020-05-17 17:17:18 +0000 |
commit | f8c9cbfe16ae8eac7e44b3353f4d3a8bf64e3936 (patch) | |
tree | 50693cf44c872bd6672c2d3d208ecb73cd0d8313 /Master/tlpkg | |
parent | b014c62690ec84e57a4791221529dbaf431ea5d8 (diff) |
default to not using cow-shell.
git-svn-id: svn://tug.org/texlive/trunk@55179 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 8daf1ffa3c4..e9deda32076 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -17,7 +17,7 @@ yyyy=2020 check_consistency=true chicken=false -cow_shell=cow-shell +cow_shell=/bin/sh critical= pretest=false recreate= @@ -30,13 +30,13 @@ gpgcmd= while test $# -gt 0; do case $1 in + --cow) cow_shell=cow-shell;; # see comments below --critical) critical=--all;; --dest) shift; tlweb=$1;; --dry-run|-n) chicken=true;; --gpgcmd) shift; gpgcmd="--gpgcmd \"$1\"";; --master) shift; Master=$1;; --no-consistency) check_consistency=false;; # takes a long time. - --no-cow) cow_shell=/bin/sh;; --no-install-pkg) update_install_pkg=false;;# trunk update after freeze --no-testinstall|-N) testinstall=false;; # and no updates; quit early. --pretest) tlweb=/home/ftp/texlive/tlpretest;; @@ -77,7 +77,7 @@ prg=`basename $0` # Below, we check for broken symlinks in the bin/ dir as installed. $Master/tlpkg/bin/tl-check-symlinks $Master/bin -# Keep the default out of ~ftp/texlive, which CTAN mirrors much of +# Keep the default out of ~ftp/texlive, which CTAN mirrors much of. test -z "$tltrybase" \ && tltrybase=`cd $tlweb/../.. && pwd`/tlnet-trial-`date +%y%m%d` tltry=$tltrybase/tlsrc.try @@ -104,8 +104,17 @@ for f in $tlweb/*; do : # skip mactex elif test "x$cow_shell" = xcow-shell; then cp -al "$f" $tltry # assume GNU cp so we can link instead of copy + # However, cow-shell may be introducing strange errors on the + # tug.org server we switched to in 2020, causing the release (tlnet) + # directory to be modified even when changes should be kept to the + # test (tltry) directory (ultimately resulting in checksum errors + # since the containers and tlpdb don't match, after a failed rebuild). + # + # We're not sure. But let's just default to straight copies, + # avoiding cow-shell, at least until we see if the problem happens + # without it, or we can get to the bottom of it. else - # no cow-shell, straight copy, for testing. + # no cow-shell, straight copy. cp -a "$f" $tltry # still assuming GNU cp for -a fi done |