diff options
author | Karl Berry <karl@freefriends.org> | 2008-08-09 18:33:05 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-08-09 18:33:05 +0000 |
commit | 320b0532dd9376c2ffded3d9ddb5d41b2131c7a3 (patch) | |
tree | 10618e7c7ae646afe01b5138508d846576db3064 /Master/tlpkg/bin/tl-update-tlnet | |
parent | e625056e4b48f938b88f367d13e2de0bbb142903 (diff) |
recognize new output strings as expected
git-svn-id: svn://tug.org/texlive/trunk@10209 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tl-update-tlnet')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 54 |
1 files changed, 31 insertions, 23 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index d59eec95c74..0a99b1a622e 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -44,28 +44,25 @@ if test ! -r "$tlweb/tlpkg/texlive.tlpdb"; then exit 1 fi test -z "$tlwebtrybase" \ -&& tlwebtrybase=`cd $tlweb/../..; pwd`/tlnet-trial-`date +%y%m%d` +&& tlwebtrybase=`cd $tlweb/../.. && pwd`/tlnet-trial-`date +%y%m%d` -# don't trap, don't remove in case of errors -#trap "rm -rf $tlwebtrybase" 0 1 2 15 +tlwebtry=$tlwebtrybase/tlsrc.try -tlwebtry=$tlwebtrybase/tldev.try -mkdir -p $tlweb/tlpkg +echo "$0: using tlweb=$tlweb" +echo "$0: using tlwebtry=$tlwebtry" +# # Be sure we're starting clean. -rm -rf $tlwebtry +rm -rf $tlwebtrybase mkdir -p $tlwebtry - -echo "$0: using tlweb=$tlweb" -echo "$0: using tltry=$tlwebtry" cp -al $tlweb/* $tlwebtry # assuming GNU cp -echo "$0: Updating in cow-shell..." +echo "$0: Updating $tlwebtry in cow-shell..." cd $tlwebtry cow-shell <<EOF -echo "$0: Updating containers..." +echo "$0: Running tl-update-containers..." $Master/tlpkg/bin/tl-update-containers -location $tlwebtry -echo "$0: Updating installer packages..." +echo "$0: Running tl-update-install-pkg..." $Master/tlpkg/bin/tl-update-install-pkg -o $tlwebtry EOF @@ -74,17 +71,20 @@ EOF # Try to make a test installation. cd $tlwebtrybase +tlwebtryinst=$tlwebtrybase/tlinst.try +yyyy=2008 + zcat $tlwebtry/install-tl-unx.tar.gz | tar -xf - cd install-tl # create profile: -echo "# texlive-profile +echo "# texlive-profile from $0 selected_scheme scheme-full -TEXDIR $tlwebtrybase/TLTEST/2008 -TEXDIRW $tlwebtrybase/TLTEST/2008 +TEXDIR $tlwebtryinst/$yyyy +TEXDIRW $tlwebtryinst/$yyyy +TEXMFSYSCONFIG $tlwebtryinst/$yyyy/texmf-config +TEXMFSYSVAR $tlwebtryinst/$yyyy/texmf-var +TEXMFLOCAL $tlwebtryinst/texmf-local TEXMFHOME ~/texmf -TEXMFLOCAL $tlwebtrybase/TLTEST/texmf-local -TEXMFSYSCONFIG $tlwebtrybase/TLTEST/2008/texmf-config -TEXMFSYSVAR $tlwebtrybase/TLTEST/2008/texmf-var option_doc 1 option_fmt 1 option_letter 0 @@ -92,7 +92,7 @@ option_src 1 option_symlinks 0 " >texlive.profile -echo "$0: Making test installation (see `pwd`/install.log)..." +echo "$0: Running test install (log: `pwd`/install.log)..." perl install-tl -location $tlwebtry -profile texlive.profile >install.log 2>&1\ || true # install-tl can fail, but we test the output!! @@ -101,7 +101,8 @@ perl install-tl -location $tlwebtry -profile texlive.profile >install.log 2>&1\ # if there are any other messages they will end up on stdout and # thus be noticed. unexpected_output=`cat install.log \ - | grep -Ev '^Using automated installation using texlive.profile' \ + | grep -Ev '^Automated TeX Live installation using profile' \ + | grep -Ev '^Platform: ' \ | grep -Ev '^Distribution: inst' \ | grep -Ev '^Directory for temporary files' \ | grep -Ev '^Installer directory:' \ @@ -114,7 +115,7 @@ unexpected_output=`cat install.log \ | grep -Ev '^writing updmap.cfg to' \ | grep -Ev '^writing language.(dat|def) data to' \ | grep -Ev '^running updmap-sys' \ - | grep -Ev '^pre-generation all format file' \ + | grep -Ev '^pre-generating all format file' \ | grep -Ev 'running post install action for' \ | grep -Ev '^ See \./index.html for links to documentati' \ | grep -Ev '^ (http://tug.org/texlive/) contains any upda' \ @@ -125,6 +126,7 @@ unexpected_output=`cat install.log \ | grep -Ev '^ Most importantly, add ' \ | grep -Ev '^ to your PATH for current and future sessions' \ | grep -Ev '^ Welcome to TeX Live' \ + | grep -Ev 'install-tl: done' \ | cat` if test -z "$unexpected_output"; then @@ -142,7 +144,13 @@ if test -z "$unexpected_output"; then exit 0 else echo "$0: Test installation failed, not removing anything!" >&2 - echo "$0: Here is the output:" >&2 - cat install.log >&2 + echo "$0: Here is the unexpected output:" >&2 + echo "$unexpected_output" >&2 + echo + echo "$0: For the full transcript file, see:" >&2 + echo "`pwd`/install.log" >&2 + echo + echo "$0: For install-tl's log file itself, with even more, see:" >&2 + echo "$0: $tlwebtryinst/$yyyy/install-tl.log" exit 1 fi |