diff options
author | Karl Berry <karl@freefriends.org> | 2008-11-21 17:47:31 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2008-11-21 17:47:31 +0000 |
commit | 9bf78ba33a525748f7055893f84748d1812d9107 (patch) | |
tree | 510e4d38dc83344e6d767c90917806c7bbbbb048 /Master/tlpkg | |
parent | 31b7e423f57fdab089c0a1cd385ae8018f7b8866 (diff) |
correct texlive.tlpdb backup, rename tlwebtry ->
tltry for simplicity.
git-svn-id: svn://tug.org/texlive/trunk@11389 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 59 |
1 files changed, 29 insertions, 30 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index c74cf8e755c..b1a8c3f49fb 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -20,7 +20,7 @@ while test $# -gt 0; do --dry-run|-n) chicken=true;; --master) shift; Master=$1;; --recreate) recreate=--recreate;; - --testlocation) shift; tlwebtrybase=$1;; + --testlocation) shift; tltrybase=$1;; --help) echo "xxtodo. Sorry."; exit 0;; --version) echo "$vc_id"; exit 0;; --*) echo "$0: unrecognized option \`$1'." >&2 @@ -41,55 +41,54 @@ if test ! -r "$tlweb/tlpkg/texlive.tlpdb"; then exit 1 fi -# Save tlpdb in case of disaster. -cp --force --backup $tlweb/tlpkg/texlive.tlpdb*systems/texlive/tlnet/2008/tlpkg/systems/texlive/tlnet/2008/tlpkg/ /tmp - # Keep the default out of ~ftp/texlive/tlnet, which CTAN mirrors. -test -z "$tlwebtrybase" \ -&& tlwebtrybase=`cd $tlweb/../.. && pwd`/tlnet-trial-`date +%y%m%d` -tlwebtry=$tlwebtrybase/tlsrc.try +test -z "$tltrybase" \ +&& tltrybase=`cd $tlweb/../.. && pwd`/tlnet-trial-`date +%y%m%d` +tltry=$tltrybase/tlsrc.try echo "$0: Using tlweb=$tlweb" # top level network directory, mirrored -echo "$0: Using tlwebtry=$tlwebtry" # local working dir +echo "$0: Using tltry=$tltry" # local working dir +# Save tlpdb in case of disaster. +cp --force --backup $tlweb/tlpkg/texlive.tlpdb* /tmp # # Be sure we're starting the test cleanly. -rm -rf $tlwebtrybase -mkdir -p $tlwebtry -cp -al $tlweb/* $tlwebtry # assuming GNU cp +rm -rf $tltrybase +mkdir -p $tltry +cp -al $tlweb/* $tltry # assuming GNU cp # Update packages in our working dir. -echo "$0: Updating $tlwebtry in cow-shell..." -cd $tlwebtry +echo "$0: Updating $tltry in cow-shell..." +cd $tltry cow-shell <<END_COW echo "$0: Running tl-update-containers..." -$Master/tlpkg/bin/tl-update-containers -location $tlwebtry $critical $recreate +$Master/tlpkg/bin/tl-update-containers -location $tltry $critical $recreate # It is scary, but I guess we should update the installer package every # day, partly for the sake of doc.html and partly so it actually gets # tested. Hopefully we don't break the Perl modules very often. echo "$0: Running tl-update-install-pkg..." -$Master/tlpkg/bin/tl-update-install-pkg -o $tlwebtry +$Master/tlpkg/bin/tl-update-install-pkg -o $tltry END_COW # -# Now we have an updated tlweb in $tlwebtry where only the changed files +# Now we have an updated tlweb in $tltry where only the changed files # are actual files, the rest are hard links. # Try to make a test installation. -cd $tlwebtrybase -tlwebtryinst=$tlwebtrybase/tlinst.try +cd $tltrybase +tltryinst=$tltrybase/tlinst.try -zcat $tlwebtry/install-tl-unx.tar.gz | tar -xf - +zcat $tltry/install-tl-unx.tar.gz | tar -xf - cd install-tl # create TL install profile: echo "# texlive-profile from $0 selected_scheme scheme-full -TEXDIR $tlwebtryinst/$yyyy -TEXDIRW $tlwebtryinst/$yyyy -TEXMFSYSCONFIG $tlwebtryinst/$yyyy/texmf-config -TEXMFSYSVAR $tlwebtryinst/$yyyy/texmf-var -TEXMFLOCAL $tlwebtryinst/texmf-local +TEXDIR $tltryinst/$yyyy +TEXDIRW $tltryinst/$yyyy +TEXMFSYSCONFIG $tltryinst/$yyyy/texmf-config +TEXMFSYSVAR $tltryinst/$yyyy/texmf-var +TEXMFLOCAL $tltryinst/texmf-local TEXMFHOME ~/texmf option_doc 1 option_fmt 1 @@ -99,7 +98,7 @@ option_symlinks 0 " >texlive.profile echo "$0: Running test install (log: `pwd`/install.log)..." -perl install-tl -location $tlwebtry -profile texlive.profile >install.log 2>&1\ +perl install-tl -location $tltry -profile texlive.profile >install.log 2>&1\ || true # install-tl can fail, but we test the output, so don't abort. # the following long grep command should filter away all *normal* @@ -142,17 +141,17 @@ unexpected_output=`cat install.log \ # if test -z "$unexpected_output"; then # no unexpected output, so ship the new packages. - cd $tlwebtrybase + cd $tltrybase if $chicken; then echo "$0: Chicken mode, not updating anything." else echo "$0: Test install ok, comparing containers." time /home/karl/bin/cmpcont >/tmp/cmpcont 2>&1 # just a test - echo "$0: Updating $tlweb from $tlwebtry." + echo "$0: Updating $tlweb from $tltry." rm -rf $tlweb - mv $tlwebtry $tlweb - rm -rf $tlwebtrybase + mv $tltry $tlweb + rm -rf $tltrybase echo "$0: Done." fi exit 0 @@ -163,6 +162,6 @@ else echo "$unexpected_output" >&2 echo echo "$0: Full transcript file: `pwd`/install.log" >&2 - echo "$0: install-tl's complete log file: $tlwebtryinst/$yyyy/install-tl.log" >&2 + echo "$0: install-tl's complete log file: $tltryinst/$yyyy/install-tl.log" >&2 exit 1 fi |