diff options
Diffstat (limited to 'Master')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-containers | 3 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 21 |
2 files changed, 15 insertions, 9 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers index 59adf6cdc9c..f6064773326 100755 --- a/Master/tlpkg/bin/tl-update-containers +++ b/Master/tlpkg/bin/tl-update-containers @@ -43,7 +43,7 @@ GetOptions( "location=s" => \$opt_location, "no-setup" => \$opt_nosetup, "recreate" => \$opt_recreate, - "relative!" => \$opt_relative, + "relative!" => \$opt_relative, "version" => \$opt_version, "help|?" => \$opt_help) or pod2usage(1); @@ -445,7 +445,6 @@ The format of the containers and the splitting of source and documentation files are controlled by the TLPDB options in the pseudo-package C<00texlive.config>. See L<TeXLive::TLPDB>. - =head1 DESCRIPTION This program compares the C<texlive.tlpdb> found relative to this script diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 1a41479ae14..c950c6d4dbb 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -9,7 +9,7 @@ vc_id='$Id$' unset CDPATH unset LS_COLORS -yyyy=2008 +yyyy=2009 chicken=false critical= @@ -17,7 +17,6 @@ recreate= do_testinstall=true verbose= - while test $# -gt 0; do case $1 in --critical) critical=--all;; @@ -36,14 +35,23 @@ while test $# -gt 0; do shift done -test -z "$tlweb" && tlweb=/home/ftp/texlive/tlnet/$yyyy +test -z "$tlweb" && tlweb=/home/ftp/texlive/tldev if test -z "$Master"; then mydir=`dirname $0` Master=`cd $mydir/../.. && pwd` fi if test ! -r "$tlweb/tlpkg/texlive.tlpdb"; then - echo "$0: no tlpdb in $tlweb/tlpkg, goodbye." >&2 + cat <<END_NO_TLPDB >&2 +$0: fatal: no file $tlweb/tlpkg/texlive.tlpdb. +$0: If you are setting up a new release, touch the file, +$0: and then use --critical --recreate. +$0: (Or otherwise set up the tlnet hierarchy manually.) +$0: Goodbye. +END_NO_TLPDB + # and typically we will fail because there are new messages + # in the installer. move the trial dir by hand to avoid + # time-consuming full recreate more than once. exit 1 fi @@ -121,7 +129,6 @@ unexpected_output=`cat install.log \ | grep -Ev '^Distribution: inst' \ | grep -Ev '^Directory for temporary files' \ | grep -Ev '^Loading ' \ - | grep -Ev '^Installing to:' \ | grep -Ev '^Installing ' \ | grep -Ev '^(re-)?running mktexlsr' \ | grep -Ev '^mktexlsr: Updating ' \ @@ -129,9 +136,9 @@ unexpected_output=`cat install.log \ | grep -Ev '^writing fmtutil.cnf data to' \ | grep -Ev '^writing updmap.cfg to' \ | grep -Ev '^writing language.(dat|def) data to' \ - | grep -Ev '^running updmap-sys' \ | grep -Ev '^pre-generating all format file' \ - | grep -Ev 'running post install action for' \ + | grep -Ev '^running ' \ + | grep -Ev '^finished ' \ | grep -Ev '^ See \./index.html for links to documentati' \ | grep -Ev '^ (http://tug.org/texlive/) contains any upda' \ | grep -Ev '^ TeX Live is a joint project of the TeX user groups' \ |