summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-02 19:40:36 +0000
committerKarl Berry <karl@freefriends.org>2020-03-02 19:40:36 +0000
commitfbf1d64d26ffb6a617fa32f6a0b130913e283940 (patch)
treefb32daacabe41db521c9645a7a6ad40ce36be342 /Master/tlpkg
parent33796c60559f70d9af0b2a429f692b03de8a4b67 (diff)
doc, syntax
git-svn-id: svn://tug.org/texlive/trunk@54010 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-containers2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-tlnet6
2 files changed, 5 insertions, 3 deletions
diff --git a/Master/tlpkg/bin/tl-update-containers b/Master/tlpkg/bin/tl-update-containers
index b37349212a1..72d11d1ace7 100755
--- a/Master/tlpkg/bin/tl-update-containers
+++ b/Master/tlpkg/bin/tl-update-containers
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# $Id$
-# Copyright 2008-2019 Norbert Preining
+# Copyright 2008-2020 Norbert Preining
# This file is licensed under the GNU General Public License version 2
# or any later version.
#
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet
index 7a4fe36c3da..a6ac9c34730 100755
--- a/Master/tlpkg/bin/tl-update-tlnet
+++ b/Master/tlpkg/bin/tl-update-tlnet
@@ -99,11 +99,15 @@ for f in $tlweb/*; do
done
# Update packages in our working dir.
+# These shell assignments have to come outside the cow-shell.
echo "$0: Updating $tltry (from $Master) with cow-shell..."
containers_prog="$Master/tlpkg/bin/tl-update-containers"
containers_args=" $verbose -location $tltry $critical $recreate $gpgcmd"
containers_invoke="$containers_prog $containers_args"
#
+update_install_prog=$Master/tlpkg/bin/tl-update-install-pkg
+update_install_invoke="$update_install_prog $gpgcmd -o $tltry"
+#
cd $tltry
cow-shell <<END_COW
echo "$0: Updating containers with (critical=$critical recreate=$recreate gpgcmd=$gpgcmd)"
@@ -116,8 +120,6 @@ fi
# 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.
-update_install_prog=$Master/tlpkg/bin/tl-update-install-pkg
-update_install_invoke="$update_install_prog $gpgcmd -o $tltry"
echo "$0: Updating install pkg with"
echo "$0: $update_install_invoke"
if $update_install_invoke; then :; else