summaryrefslogtreecommitdiff
path: root/Master/tlpkg/libexec
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2012-10-21 00:05:13 +0000
committerKarl Berry <karl@freefriends.org>2012-10-21 00:05:13 +0000
commited7f9d1b31e010c54e353fd28da8a1fca34ee51f (patch)
tree7ef3bb80c3404ada413eecb65322736f9013cefc /Master/tlpkg/libexec
parent5ffb4c20aaabde2cc7f9444eda638193c26cc8e1 (diff)
new script adhocfilelist (20oct12), and handle both bin and nobin scripts in .tds.zip
git-svn-id: svn://tug.org/texlive/trunk@28038 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/libexec')
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds25
1 files changed, 17 insertions, 8 deletions
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index 1c4258530a0..4015d81d1bf 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2225,6 +2225,7 @@ $standardxmt='\.xmt';
%specialscripts_bin = (
'a2ping' => '\.pl$',
'accfonts' => 'mkt1font|vpl2',
+ 'adhocfilelist' => 'adhocfilelist\.sh$',
'authorindex' => 'authorindex$',
'bibexport' => 'bibexport\.sh$',
'bundledoc' => '(arlatex|bundledoc)$',
@@ -2901,30 +2902,38 @@ sub doscripts {
my $build_tldir = "texk/texlive";
my $build_scriptsdir = "$build_tldir/linked_scripts";
my $builddir = "$BUILDDEST/$build_scriptsdir/$package";
+ #
+ my $scriptsdir = "$DEST/scripts/$package";
+ #
my @scripts = ();
# first do the user-visible bindir entries.
$scriptpatt = $specialscripts_bin{$package};
if ($scriptpatt) {
- if ($pwd ne "$DEST/scripts/$package") {
+ if ($pwd ne $scriptsdir) {
# in the .tds.zip case, we will already be in the scripts dir.
- &install ("$DEST/scripts/$package", $scriptpatt);
- &SYSTEM ("chmod a+x $DEST/scripts/$package/*");
+ &install ($scriptsdir, $scriptpatt);
+ &SYSTEM ("chmod a+x $scriptsdir/*");
}
#
+ # determine list of scripts from scriptpatt, since a .tds.zip (e.g.,
+ # adhocfilelist) might have unpacked others into the scripts/ dir.
+ chomp (@scripts = grep (/$scriptpatt/, `ls $scriptsdir`));
+ #
# update the copy in Build (the reason we do the bindir ones first).
&xmkdir ($builddir);
- &SYSTEM ("$CP $DEST/scripts/$package/* $builddir/");
- chomp (@scripts = `cd $builddir && ls`);
+ for my $s (@scripts) {
+ &SYSTEM ("$CP $scriptsdir/$s $builddir/");
+ }
}
# then do the ones that go only under scripts/ and not in the bindirs.
my $nobin_scriptpatt = $specialscripts_nobin{$package};
if ($nobin_scriptpatt) {
- if ($pwd ne "$DEST/scripts/$package") {
+ if ($pwd ne $scriptsdir) {
# in the .tds.zip case, we will already be in the scripts dir.
- &install ("$DEST/scripts/$package", $nobin_scriptpatt);
- &SYSTEM ("chmod a+x $DEST/scripts/$package/*");
+ &install ($scriptsdir, $nobin_scriptpatt);
+ &SYSTEM ("chmod a+x $scriptsdir/*");
}
}