summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2016-11-10 23:19:14 +0000
committerKarl Berry <karl@freefriends.org>2016-11-10 23:19:14 +0000
commit73c563a4f07da59e19c7173e8fde84de04ed628e (patch)
tree1b11b64c7db9af9c9e978d2d94b403fc84de8cf4
parentb692eb65efb591db6c8b00e5ea44933f46edebef (diff)
fira (10nov16)
git-svn-id: svn://tug.org/texlive/trunk@42481 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/ctan2tl1
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds4
2 files changed, 4 insertions, 1 deletions
diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl
index 8c7a29d0068..f392fbc053d 100755
--- a/Master/tlpkg/bin/ctan2tl
+++ b/Master/tlpkg/bin/ctan2tl
@@ -133,6 +133,7 @@ find $pkg -depth -type d | xargs rmdir 2>/dev/null # remove empty directories
spacenames="`find $pkg -name \*\ \*`"
if test -n "$spacenames"; then
echo "$0: cooked hierarchy contains files with spaces, goodbye:" >&2
+ echo "in `pwd`/$pkg:" >&2
echo "$spacenames" >&2
exit 1
fi
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 245e8d7ddee..75d33b1d09d 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -3038,7 +3038,9 @@ for (@ARGV) {
#
sub sanitize_file_names {
my ($dir) = @_;
- &SYSTEM ("find $dir -print | xargs rename 's![^-_A-Za-z0-9.,/+]!!g'");
+ # -0 in case of spaces or other chars in filenames, which would be
+ # parsed into words by the shell otherwise.
+ &SYSTEM ("find $dir -print0 | xargs -0 /l/bin/rename 's![^-_A-Za-z0-9.,/+]!!g'");
}