summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2011-09-12 23:55:56 +0000
committerKarl Berry <karl@freefriends.org>2011-09-12 23:55:56 +0000
commit24579180da51beb0b66f8014929adcc247b8f945 (patch)
treedf4905e8c4e03ac4b2052abe5031e9dcdb7c1d2f
parentec101e315bca605deccdc06127781caf969e9050 (diff)
first attempt at ctan mirror extraction
git-svn-id: svn://tug.org/texlive/trunk@23925 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto46
-rwxr-xr-xMaster/tlpkg/bin/tl-update-ctan-mirrors (renamed from Master/tlpkg/bin/tl-ctan-mirror-to-perl-hash)0
-rw-r--r--Master/tlpkg/doc/packages.txt8
-rw-r--r--Master/tlpkg/installer/ctan-mirrors.pl (renamed from Master/tlpkg/installer/mirrors.pl)0
4 files changed, 43 insertions, 11 deletions
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index 68eb87a50f7..a48be70c32d 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -7,30 +7,33 @@
PATH=/usr/local/gnu/bin:/usr/local/bin:$PATH; export PATH
umask 0
+# maybe someday we'll make real options.
chicken=echo
chicken=
#
verbose=echo
verbose=false
#
+config_scripts_only=false
+
+TMPDIR=/tmp/tlua; export TMPDIR
+test -d $TMPDIR || mkdir $TMPDIR
+test -d $TMPDIR || { echo "$0: no directory $TMPDIR, goodbye." >&2; exit 1; }
+
cp="cp -fv"
mv="mv -fv"
diff="diff -U 2"
-# maybe someday we'll make real options.
-config_scripts_only=false
-
mydir=`cd \`dirname $0\` && /bin/pwd`
Master=`cd $mydir/../.. && /bin/pwd`
cd $Master || exit 1
-temp=/tmp/ua$$
+temp=$TMPDIR/ua$$
trap "rm -f $temp*" 0 1 2 15
update_list=
add_list=
-
# autogenerate README.EN from readme.html.
#
if $config_scripts_only; then :; else
@@ -166,10 +169,10 @@ if $config_scripts_only; then :; else
# (we need to ignore the timestamps in the generation lines.)
same_except_for_th ()
{
- rm -f /tmp/seft1 /tmp/seft2
- sed '/^\.TH/d' <"$1" >/tmp/seft1
- sed '/^\.TH/d' <"$2" >/tmp/seft2
- cmp -s /tmp/seft1 /tmp/seft2
+ rm -f $TMPDIR/seft1 $TMPDIR/seft2
+ sed '/^\.TH/d' <"$1" >$TMPDIR/seft1
+ sed '/^\.TH/d' <"$2" >$TMPDIR/seft2
+ cmp -s $TMPDIR/seft1 $TMPDIR/seft2
}
mandir=texmf/doc/man
@@ -192,7 +195,7 @@ for script in texmf/scripts/texlive/tlmgr.pl install-tl; do
# Update the version on the web site; since these aren't checked in, we
# can do it unconditionally.
#
- pod2html="$chicken pod2html --cachedir=/tmp"
+ pod2html="$chicken pod2html --cachedir=$TMPDIR"
$pod2html $script >$webdir/$basescript.html
fi
done
@@ -224,7 +227,7 @@ fi # !config_scripts_only
# texcatalogue.keywords
#
if $config_scripts_only; then :; else
-cat_dump=/tmp/tc.xml
+cat_dump=$TMPDIR/tc.xml
rm -f $cat_dump.new
wget --quiet ftp://tug.ctan.org/ftpmaint/az/texcatalogue.xml -O $cat_dump.new \
&& test -s $cat_dump.new && mv $cat_dump.new $cat_dump
@@ -246,6 +249,27 @@ fi
fi # !config_scripts_only
+# ctan mirror list from ctan.
+if $config_scripts_only; then :; else
+ctan_mirrors=$TMPDIR/mirrors # incoming data from CTAN
+ctan_mirmon=$TMPDIR/mirmon.state
+mirrors4tl=tlpkg/installer/ctan_mirrors.pl # massaged for TL
+
+if wget --quiet http://ctan.org/mirrors -O $ctan_mirrors \
+ && rsync rsync://comedy.dante.de/MirMon/mirmon.state $ctan_mirmon; then
+ $mydir/tl-update-ctan-mirrors $ctan_mirrors $ctan_mirmon >$mirrors_4tl.new
+ if $diff $mirrors4tl.new $mirrors4tl; then
+ $verbose " $mirrors4tl ok."
+ else
+ $chicken $cp $mirrors4tl.new $mirrors4tl
+ update_list="$update_list $mirrors4tl"
+ fi
+else
+ echo "$0: ctan mirror data not retrievable, skipping." >&2
+fi
+fi # !config_scripts_only
+
+
# svn commits.
status=0
if test -z "$update_list"; then
diff --git a/Master/tlpkg/bin/tl-ctan-mirror-to-perl-hash b/Master/tlpkg/bin/tl-update-ctan-mirrors
index a7404222337..a7404222337 100755
--- a/Master/tlpkg/bin/tl-ctan-mirror-to-perl-hash
+++ b/Master/tlpkg/bin/tl-update-ctan-mirrors
diff --git a/Master/tlpkg/doc/packages.txt b/Master/tlpkg/doc/packages.txt
index 10fc7ae2c16..090af62d586 100644
--- a/Master/tlpkg/doc/packages.txt
+++ b/Master/tlpkg/doc/packages.txt
@@ -127,6 +127,14 @@ svn copy -r 23181 -m'branch2011 branch based on r23181' svn://tug.org/texlive/tr
Do both a branch and a tag so that it's possible to easily compare the
current state of the branch with its starting point (the tag).
+ Then, to check out the branch, so critical source fixes can be applied
+ for the distros:
+cd /home/texlive
+rm -rf branch # if starting a new year on tug
+mkdir branch; cd branch
+svn co file:///home/svn/texlive/branches/branch2011/Build/source . >&out
+
+
- update ~karl/bin/cron.tl, and reenable when feel ready.
critical=
pretest=
diff --git a/Master/tlpkg/installer/mirrors.pl b/Master/tlpkg/installer/ctan-mirrors.pl
index 9c9f9cf3ae1..9c9f9cf3ae1 100644
--- a/Master/tlpkg/installer/mirrors.pl
+++ b/Master/tlpkg/installer/ctan-mirrors.pl