diff options
author | Norbert Preining <preining@logic.at> | 2016-04-13 07:10:41 +0000 |
---|---|---|
committer | Norbert Preining <preining@logic.at> | 2016-04-13 07:10:41 +0000 |
commit | b1352c1942a5b63bc37c0a2359b960fcb8dc5037 (patch) | |
tree | 6d0afa00df5a90a612a81da69e4115c3dcda7d7b /Master/tlpkg/bin/tl-update-tlnet | |
parent | 6fdb8d562de4acfc326b7177140be98467912a7e (diff) |
fixes for gpg updates
git-svn-id: svn://tug.org/texlive/trunk@40485 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin/tl-update-tlnet')
-rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index ed61f4dce20..827c27c870b 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -20,6 +20,7 @@ scheme=full testinstall=true tlweb=/home/ftp/texlive/tlnet verbose= +gpgcmd= while test $# -gt 0; do case $1 in @@ -31,6 +32,7 @@ while test $# -gt 0; do --pretest) tlweb=/home/ftp/texlive/tlpretest;; --recreate) recreate=--recreate;; --scheme) shift; scheme=$1;; + --gpgcmd) shift; gpgcmd="--gpgcmd \"$1\"";; --testlocation) shift; tltrybase=$1;; -v|-vv|-vvv) verbose=$1;; --help) echo "ustl. sorry."; exit 0;; @@ -83,14 +85,14 @@ 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 \ +$Master/tlpkg/bin/tl-update-containers $gpgcmd \ $verbose -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 $tltry +$Master/tlpkg/bin/tl-update-install-pkg $gpgcmd -o $tltry END_COW # if not doing the test installation, don't push anything out. @@ -138,6 +140,7 @@ perl install-tl -location $tltry -profile texlive.profile \ unexpected_output=`cat $tlnet_install_log \ | sed '/The following environment variables/,/^ ------/d' \ | grep -Ev '^ ------' \ + | grep -Ev '^cryptographic signature of' \ | grep -Ev '^Automated TeX Live installation using profile' \ | grep -Ev '^Installing from:' \ | grep -Ev '^Platform: ' \ |