diff options
Diffstat (limited to 'Master/tlpkg/bin')
| -rwxr-xr-x | Master/tlpkg/bin/c2l | 4 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/ctan2tl | 30 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-auto | 13 |
3 files changed, 26 insertions, 21 deletions
diff --git a/Master/tlpkg/bin/c2l b/Master/tlpkg/bin/c2l index 96192d5d80d..cb1a740348f 100755 --- a/Master/tlpkg/bin/c2l +++ b/Master/tlpkg/bin/c2l @@ -5,7 +5,7 @@ # Convenience front-end script to run ctan2tl. It rearranges the output # so error messages come first, then the list of changed files. Also # accepts platform abbreviations to run tl-update-bindir, etc. Don't -# take it too seriously; it surely needs generalizing. +# take it too seriously, it's just for convenience. use Cwd; use File::Basename; @@ -71,7 +71,7 @@ sub main { exit 0; } elsif ($arg eq "cg" || $arg eq "moj" || $arg eq "mojca") { - for my $p (qw(i386-freebsd amd64-freebsd + for my $p (qw(aarch-linux i386-freebsd amd64-freebsd x86_64-darwinlegacy i386-solaris x86_64-solaris)) { system ("$0 $p") && die "cg/$p failed"; diff --git a/Master/tlpkg/bin/ctan2tl b/Master/tlpkg/bin/ctan2tl index fa14e9279d5..49c46849485 100755 --- a/Master/tlpkg/bin/ctan2tl +++ b/Master/tlpkg/bin/ctan2tl @@ -19,14 +19,14 @@ test -d $raw || mkdir $raw cd $raw || exit 1 if test "x$1" = x--help; then - echo "Usage: $0 [--place] [--no-ctan] TLPKGNAME" + echo "Usage: $0 [--place] [--no-ctan] [--git] TLPKGNAME" echo echo "Install a package from CTAN into TeX Live." echo - echo "--place, -p perform repository adds/removes." - echo "--no-ctan if already have files in Build/tmp.raw/PKG." - echo "--contrib for https://contrib.texlive.info" - echo "--git for git" + echo "--place,-p,p perform repository adds/removes." + echo "--no-ctan if already have files in Build/tmp.raw/PKG." + echo "--contrib for https://contrib.texlive.info." + echo "--git for git." echo echo "This never actually commits anything to the repository," echo "but it does svn update the potentially affected directories." @@ -45,19 +45,18 @@ copy_from_ctan=true contrib_ctan2tds_arg= contrib_place_arg= mode=svn -while true; do +pkg= +while test $# -gt 0; do case "$1" in - '-p'|'--place') + 'p'|'-p'|'--place') place_chicken= shift;; '--no-ctan') copy_from_ctan=false shift;; '--contrib') - do_contrib=true - shift - contrib_place="$1" - shift + do_contrib=true; shift + contrib_place="$1"; shift contrib_ctan2tds_arg=--contrib contrib_place_arg="--contrib=$contrib_place --mode=git" ;; @@ -65,12 +64,15 @@ while true; do mode="git" shift;; *) - break - ;; + if test -n "$pkg"; then + echo "$0: package $pkg already specified, unexpected second: $1" >&2 + exit 1 + fi + pkg=$1 + shift;; esac done -pkg=$1 if test -z "$pkg"; then echo "$0: no TL package name specified." >&2 exit 1 diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto index bbe1d1a1520..f75902a412b 100755 --- a/Master/tlpkg/bin/tl-update-auto +++ b/Master/tlpkg/bin/tl-update-auto @@ -249,17 +249,20 @@ fi fi # !config_scripts_only -# ctan mirror list from ctan. Update daily since there is constant -# churn. Something awry with the probing? -# || test `expr $(date +%d) % 2` = 0 +# ctan mirror list from ctan. There is constant churn, so don't +# update more than once a day. 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 https://ctan.org/tex-archive/CTAN.sites -O $ctan_mirrors \ + if test -n "`find $mirrors4tl -newermt '23 hours ago'`"; then + echo "$0: ctan mirror list already updated today, skipping update:" >&2 + ls -l $mirrors4tl >&2 + + elif wget --quiet https://ctan.org/tex-archive/CTAN.sites -O $ctan_mirrors \ && rsync rsync://comedy.dante.de/MirMon/mirmon.state $ctan_mirmon; then - $mydir/tl-update-ctan-mirrors $ctan_mirrors $ctan_mirmon >$mirrors4tl.new + $mydir/tl-update-ctan-mirrors -v $ctan_mirrors $ctan_mirmon >$mirrors4tl.new if $diff $mirrors4tl $mirrors4tl.new; then $verbose " $mirrors4tl ok." rm -f $mirrors4tl.new |