summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-10-28 17:42:02 +0000
committerKarl Berry <karl@freefriends.org>2010-10-28 17:42:02 +0000
commit596d5c71428330abbb7e8df0de60a0f24766958b (patch)
tree7bef84e364213cad74066c834a509ad2ce95335a
parent75bff2cae5b1c3a14fb9689d9789b244e68a0263 (diff)
move texcatalogue.keywords
git-svn-id: svn://tug.org/texlive/trunk@20233 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/texmf/scripts/texlive/tlmgr.pl7
-rw-r--r--Master/texmf/scripts/texlive/var/texcatalogue.keywords (renamed from Master/tlpkg/texcatalogue.keywords)0
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto4
3 files changed, 6 insertions, 5 deletions
diff --git a/Master/texmf/scripts/texlive/tlmgr.pl b/Master/texmf/scripts/texlive/tlmgr.pl
index a1541de04f1..a3a892f0f0b 100755
--- a/Master/texmf/scripts/texlive/tlmgr.pl
+++ b/Master/texmf/scripts/texlive/tlmgr.pl
@@ -1174,15 +1174,16 @@ sub action_path {
sub load_taxonomy_datafile {
init_local_db();
my $taxonomy;
- my $fpath = $localtlpdb->root . "/tlpkg/texcatalogue.keywords";
+ my $fpath = $localtlpdb->root
+ . "/texmf/scripts/texlive/var/texcatalogue.keywords";
if (! -r $fpath) {
tlwarn("tlmgr: taxonomy file $fpath not readable.\n");
return;
}
my $foo = `cat $fpath`;
no strict "vars";
- # the no strict "vars" is *ABSOLUT* necessary otherwise the file is not
- # evaluated, no idea why!
+ # the no strict "vars" is *ABSOLUTELY* necessary otherwise the file is
+ # not evaluated, no idea why!
eval "$foo";
use strict "vars";
return $taxonomy;
diff --git a/Master/tlpkg/texcatalogue.keywords b/Master/texmf/scripts/texlive/var/texcatalogue.keywords
index 56ae87d7d1a..56ae87d7d1a 100644
--- a/Master/tlpkg/texcatalogue.keywords
+++ b/Master/texmf/scripts/texlive/var/texcatalogue.keywords
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 5eef7a66728..8dbde5c8164 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -226,13 +226,13 @@ fi # !config_scripts_only
if $config_scripts_only; then :; else
cat_dump=/tmp/tc.xml
rm -f $cat_dump.new
-wget -nv ftp://tug.ctan.org/ftpmaint/az/texcatalogue.xml -O $cat_dump.new \
+wget --quiet ftp://tug.ctan.org/ftpmaint/az/texcatalogue.xml -O $cat_dump.new \
&& mv $cat_dump.new $cat_dump
# if ftp fails, we'll reprocess the old dump, but that should be harmless.
$mydir/tl-update-keywords -input $cat_dump | tee $temp.keywords \
| grep -v '# Generated' >$temp.keywords.new
#
-keywordfile=tlpkg/texcatalogue.keywords
+keywordfile=texmf/scripts/texlive/var/texcatalogue.keywords
grep -v '# Generated' $keywordfile >$temp.keywords.cur
if $diff $temp.keywords.cur $temp.keywords.new >$temp.keywords.diff; then
$verbose " $keywordfile ok."