ctan-o-mat wrappers

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

27 files changed, 49 insertions, 25 deletions

diff --git a/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat b/Build/source/texk/texlive/linked_scripts/ctan-o-mat/ctan-o-mat
index 3041dc07ad3..3041dc07ad3 100755
--- a/Master/texmf-dist/doc/support/ctan-o-mat/ctan-o-mat
+++ b/Build/source/texk/texlive/linked_scripts/ctan-o-mat/ctan-o-mat
diff --git a/Master/bin/aarch64-linux/ctan-o-mat b/Master/bin/aarch64-linux/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/aarch64-linux/ctan-o-mat
+++ b/Master/bin/aarch64-linux/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/amd64-freebsd/ctan-o-mat b/Master/bin/amd64-freebsd/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/amd64-freebsd/ctan-o-mat
+++ b/Master/bin/amd64-freebsd/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/amd64-netbsd/ctan-o-mat b/Master/bin/amd64-netbsd/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/amd64-netbsd/ctan-o-mat
+++ b/Master/bin/amd64-netbsd/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/armel-linux/ctan-o-mat b/Master/bin/armel-linux/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/armel-linux/ctan-o-mat
+++ b/Master/bin/armel-linux/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/armhf-linux/ctan-o-mat b/Master/bin/armhf-linux/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/armhf-linux/ctan-o-mat
+++ b/Master/bin/armhf-linux/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-cygwin/ctan-o-mat b/Master/bin/i386-cygwin/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-cygwin/ctan-o-mat
+++ b/Master/bin/i386-cygwin/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-darwin/ctan-o-mat b/Master/bin/i386-darwin/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-darwin/ctan-o-mat
+++ b/Master/bin/i386-darwin/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-freebsd/ctan-o-mat b/Master/bin/i386-freebsd/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-freebsd/ctan-o-mat
+++ b/Master/bin/i386-freebsd/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-linux/ctan-o-mat b/Master/bin/i386-linux/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-linux/ctan-o-mat
+++ b/Master/bin/i386-linux/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-linuxmusl/ctan-o-mat b/Master/bin/i386-linuxmusl/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-linuxmusl/ctan-o-mat
+++ b/Master/bin/i386-linuxmusl/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-netbsd/ctan-o-mat b/Master/bin/i386-netbsd/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-netbsd/ctan-o-mat
+++ b/Master/bin/i386-netbsd/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/i386-solaris/ctan-o-mat b/Master/bin/i386-solaris/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/i386-solaris/ctan-o-mat
+++ b/Master/bin/i386-solaris/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/powerpc-darwin/ctan-o-mat b/Master/bin/powerpc-darwin/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/powerpc-darwin/ctan-o-mat
+++ b/Master/bin/powerpc-darwin/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/powerpc-linux/ctan-o-mat b/Master/bin/powerpc-linux/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/powerpc-linux/ctan-o-mat
+++ b/Master/bin/powerpc-linux/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/sparc-solaris/ctan-o-mat b/Master/bin/sparc-solaris/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/sparc-solaris/ctan-o-mat
+++ b/Master/bin/sparc-solaris/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/texmf-dist/source/support/ctan-o-mat/ctan-o-mat.bat b/Master/bin/win32/ctan-o-mat.bat
index 14aa5ff188b..14aa5ff188b 100755
--- a/Master/texmf-dist/source/support/ctan-o-mat/ctan-o-mat.bat
+++ b/Master/bin/win32/ctan-o-mat.bat
diff --git a/Master/bin/win32/ctan-o-mat.exe b/Master/bin/win32/ctan-o-mat.exe
deleted file mode 100755
index 5777d90a17a..00000000000
--- a/Master/bin/win32/ctan-o-mat.exe
+++ /dev/null
diff --git a/Master/bin/x86_64-cygwin/ctan-o-mat b/Master/bin/x86_64-cygwin/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/x86_64-cygwin/ctan-o-mat
+++ b/Master/bin/x86_64-cygwin/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwin/ctan-o-mat b/Master/bin/x86_64-darwin/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/x86_64-darwin/ctan-o-mat
+++ b/Master/bin/x86_64-darwin/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/x86_64-darwinlegacy/ctan-o-mat b/Master/bin/x86_64-darwinlegacy/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/x86_64-darwinlegacy/ctan-o-mat
+++ b/Master/bin/x86_64-darwinlegacy/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/x86_64-linux/ctan-o-mat b/Master/bin/x86_64-linux/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/x86_64-linux/ctan-o-mat
+++ b/Master/bin/x86_64-linux/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/x86_64-linuxmusl/ctan-o-mat b/Master/bin/x86_64-linuxmusl/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/x86_64-linuxmusl/ctan-o-mat
+++ b/Master/bin/x86_64-linuxmusl/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/bin/x86_64-solaris/ctan-o-mat b/Master/bin/x86_64-solaris/ctan-o-mat
index ed6a2d963c2..e21984663f5 120000
--- a/Master/bin/x86_64-solaris/ctan-o-mat
+++ b/Master/bin/x86_64-solaris/ctan-o-mat
@@ -1 +1 @@
-../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat.pl
\ No newline at end of file
+../../texmf-dist/scripts/ctan-o-mat/ctan-o-mat
\ No newline at end of file
diff --git a/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf b/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
index a73c5f13c86..88803ca368c 100644
--- a/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/ctan-o-mat.man1.pdf
diff --git a/Master/texmf-dist/scripts/ctan-o-mat/ctan-o-mat b/Master/texmf-dist/scripts/ctan-o-mat/ctan-o-mat
new file mode 100755
index 00000000000..3041dc07ad3
--- /dev/null
+++ b/Master/texmf-dist/scripts/ctan-o-mat/ctan-o-mat
@@ -0,0 +1,21 @@
+#/bin/sh
+##-----------------------------------------------------------------------------
+## This file is part of ctan-o-mat.
+## This program is distributed under BSD-like license. See file LICENSE
+## 
+## (c) 2016-2017 Gerd Neugebauer
+## 
+## Net: gene@gerd-neugebauer.de
+## 
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of a 3-clause BSD-like license as stated in the
+## file LICENSE contained in this distribution.
+##
+## You should have received a copy of the LICENSE along with this
+## program; if not, see the repository under http://***.
+##
+##-----------------------------------------------------------------------------
+
+exec perl "$0.pl" "$@"
+
+#
\ No newline at end of file
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 396885cf660..29a6567bbcb 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -27,8 +27,8 @@ use Cwd;
 use vars qw($opt_ctan_dir);
 
 # programs used; must all be on the path
-$MV = "mv";
-$CP = "cp -p";
+$MV = "mv -v";
+$CP = "cp -pv";
 $RM = "rm -vf";  # just to get feedback from GNU rm on removals
 $MAKEINFO = "makeinfo";
 $INSTALL = "install -D -m 664";
@@ -2315,6 +2315,7 @@ $standardsource = '(\.(bat|c|drv|dtx|fea|fdd|ins|sfd)'
  'cmextra',             'NULL',
  'concmath-fonts',      'NULL',
  'crossword',           $standardsource . '|AcrossLite',
+ 'ctan-o-mat',          'NULL',                 # process .bat
  'cyrplain',            'NULL',                 # all in tex
  'dccpaper',            $standardsource . '|Makefile',
  'docbytex',		'NULL',
@@ -2806,6 +2807,7 @@ $standardttf = '\.ttf|\.TTC';
  'bib2gls'		=> '\.jar$',
  'changes'		=> '\.bash$',
  'cloze'		=> '\.lua$',
+ 'ctan-o-mat'		=> 'ctan-o-mat(|\.pl)$',
  'epspdf'               => '(epspdf(|\.help|boot|tk)|\.rb|makegray\.pro)$',
  'latex2nemeth'         => '\.jar$',
  'latex-make'           => '\.py$',
@@ -2846,7 +2848,7 @@ $standardttf = '\.ttf|\.TTC';
  'cjk-gs-integrate'     => '\.pl$',
  'convbkmk'             => '\.rb$',
  'crossrefware'		=> '\.pl$',
- 'ctan-o-mat'		=> '\.pl$',
+ 'ctan-o-mat'		=> 'ctan-o-mat$',
  'ctanify'              => '^ctanify$',
  'ctanupload'           => '\.pl$',
  'de-macro'             => 'de-macro',
@@ -3738,7 +3740,8 @@ sub doscripts {
           &SYSTEM ("$MV $s.bat.noMiKTeX $scriptsdir");
           # best to have wrapper also, maybe?
 
-        } elsif ($s eq "lua2dox_filter") {  # package lua2dox
+        } elsif ($s eq "lua2dox_filter"   # package lua2dox
+                 || $s eq "ctan-o-mat") { # package ctan-o-mat
           # handwritten .bat
           &SYSTEM ("$MV $s.bat $platdir/");
           next; # no wrapper