From 06aa4bfd3f6e772454ecadff010fa7484c0d2edd Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 13 Feb 2018 10:11:11 +0900 Subject: use TL's tl-sign-file and env vars for signing --- tl-sign-file | 24 ------------------------ update.sh | 8 ++++++-- 2 files changed, 6 insertions(+), 26 deletions(-) delete mode 100755 tl-sign-file diff --git a/tl-sign-file b/tl-sign-file deleted file mode 100755 index 2d54a52a..00000000 --- a/tl-sign-file +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -# $Id$ -# Public domain. Originally written 2016, Norbert Preining -# Sign a file for release in TeX Live - -if test $# -ne 1; then - echo "$0: Exactly one argument must be given, the file to sign." >&2 - exit 1 -fi - -# remove previous signature -rm -f "$1.asc" - -prg=gpg -if ! [ "x$TL_GNUPG" = "x" ] ; then - # use the environment variable TL_GNUPG - prg=$TL_GNUPG -fi - -# sign -$prg --armor \ - --detach-sign \ - --local-user 0xEC00B8DAD32266AA \ - "$1" diff --git a/update.sh b/update.sh index 27a1c366..df83b4e6 100755 --- a/update.sh +++ b/update.sh @@ -15,6 +15,9 @@ TLCHECKOUT=${TLCHECKOUT:-/home/norbert/Development/TeX/texlive.git} TLNETDEST=${TLNETDEST:-/home/norbert/Domains/server/texlive.info/contrib/2017} TLCATALOGUE=${TLCATALOGUE:-/home/norbert/Development/TeX/texcatalogue-svn} +# how to sign +export TL_GNUPGOPTS="--local-user 0xEC00B8DAD32266AA" + # we don't do TeX Catalogue updates #unset TEX_CATALOGUE @@ -76,16 +79,17 @@ if $do_tlpdb ; then --master=`pwd` fi + if $do_sign ; then - gpgcmd="-gpgcmd `pwd`/tl-sign-file" + gpgcmd= else gpgcmd=-no-sign fi if $do_container ; then $TLCHECKOUT/Master/tlpkg/bin/tl-update-containers \ -master `pwd` \ - -location $TLNETDEST \ $gpgcmd \ + -location $TLNETDEST \ -all # sometimes we need -recreate grep ^name tlpkg/texlive.tlpdb | grep -v 00texlive | grep -v '\.' | awk '{print$2}' | sort > $TLNETDEST/packages.txt -- cgit v1.2.3