biber (3feb22)

git-svn-id: svn://tug.org/texlive/trunk@61867 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 4 insertions, 8 deletions

diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 973508a534c..2ab8391c5ba 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -30,7 +30,7 @@ use vars qw($opt_ctan_dir);
 # programs used; must all be on the path
 $MV = "mv -v";
 $CP = "cp -pv";
-$RM = "rm -vf";  # just to get feedback from GNU rm on removals
+$RM = "rm -vf";  # -v to get feedback via GNU rm on removals
 $MAKEINFO = "makeinfo";
 $INSTALL = "install -D -m 664";
 
@@ -6231,8 +6231,8 @@ sub POSTbiber {
   # move doc pdf.
   &mv_with_mkdir ("biber.pdf", $DOCDIR);
 
-  # we don't do 64-bit Windows or i386-darwin.
-  &SYSTEM ("$RM biber-MSWIN64* darwin_x86_i386");
+  # we don't do 64-bit Windows, etc.
+  &SYSTEM ("$RM biber-MSWIN64* biber-darwin_arm*");
 
   # biber uses different platform names.
   my %tl_platform = (
@@ -6240,7 +6240,7 @@ sub POSTbiber {
     "amd64-freebsd"      => "amd64-freebsd",
     "cygwin32"           => "i386-cygwin",
     "cygwin64"           => "x86_64-cygwin",
-    "darwin_x86_64"      => "x86_64-darwin",
+    "darwin_x86_64"      => "universal-darwin",
     "darwinlegacy_x86_64"=> "x86_64-darwinlegacy",
     "i386-freebsd"       => "i386-freebsd",
     "i386-pc-solaris2"   => "i386-solaris",
@@ -6263,10 +6263,6 @@ sub POSTbiber {
     my $biber_binary = "biber";
     $biber_binary .= ".exe" if $archive =~ /MSWIN|cygwin/i;
 
-    # musl tarball has wrong name, hopefully just once.
-    my $musl = "biber-linux_x86_64-musl";
-    &xsystem ("$MV $musl $biber_binary") if -r $musl;
-    
     # Put the executable in the Master bin directory.
     (my $biber_platform = $archive) =~ s/biber-(.*?)\..*/$1/;
     my $tl_platform = $tl_platform{$biber_platform};