From 0c75ddd70615555cbefcd7b1d0744a695bb64dec Mon Sep 17 00:00:00 2001 From: Norbert Preining Date: Tue, 13 Feb 2018 00:48:47 +0000 Subject: move necessary options to TL_GNUPGMAINOPTS git-svn-id: svn://tug.org/texlive/trunk@46620 c570f23f-e606-0410-a88d-b1316a301751 --- Master/tlpkg/bin/tl-sign-file | 11 +++++++---- Master/tlpkg/doc/repository-setup.txt | 36 ++++++++++++++++++++++++++--------- 2 files changed, 34 insertions(+), 13 deletions(-) diff --git a/Master/tlpkg/bin/tl-sign-file b/Master/tlpkg/bin/tl-sign-file index 73721ebf54c..4398262b6eb 100755 --- a/Master/tlpkg/bin/tl-sign-file +++ b/Master/tlpkg/bin/tl-sign-file @@ -14,16 +14,19 @@ rm -f "$1.asc" prg=gpg gpgopts="--batch --homedir /home/texlive/.gnupg \ --passphrase-file /home/texlive/.gnupg/passphrase \ - --armor --detach-sign --local-user 0x06BAB6BC " + --local-user 0x06BAB6BC " +gpgmainopts="--armor --detach-sign" +# use the environment variables if available if test -n "$TL_GNUPG" ; then - # use the environment variable TL_GNUPG prg=$TL_GNUPG fi if test -n "$TL_GNUPGOPTS" ; then - # use the environment variable TL_GNUPGOPTS gpgopts=$TL_GNUPGOPTS fi +if test -n "$TL_GNUPGMAINOPTS" ; then + gpgmainopts=$TL_GNUPGMAINOPTS +fi # sign -"$prg" $gpgopts "$1" +"$prg" $gpgmainopts $gpgopts "$1" diff --git a/Master/tlpkg/doc/repository-setup.txt b/Master/tlpkg/doc/repository-setup.txt index 85f8d96fc6e..74e7f1570cb 100644 --- a/Master/tlpkg/doc/repository-setup.txt +++ b/Master/tlpkg/doc/repository-setup.txt @@ -13,7 +13,7 @@ can use it. Possible applications include distribution of company-internal packages or non-free stuff not included in TeX Live. The current document is based on the status of the TeX Live repository -scripts as of 2018-02-12. +scripts as of 2018-02-13. Please write tex-live@tug.org if questions or suggestions. @@ -80,8 +80,18 @@ from there. See Section 9 for an example management script. 2. Preparing your repository ---------------------------- -Create a root folder which will mirror our directory layout. We will call -that root folder ROOT from now on. +You will have to deal with two different folders on your system: +* The preparation place, where you collect the files of the packages + and create the necessary configuration files. + We will refer to this folder as + ROOT + In TeX Live this would be the subversion repository. +* The generated repository which will be synced to some web server + and accessed via tlmgr. This folder will be generated and maintained + by the scripts mentioned in this document. + We will refer to this folder as + NETROOT + In TeX Live this would be the 'tlnet' folder. Put all of YOUR files in a TDS compliant way into the texmf-dist folder: ROOT/texmf-dist @@ -170,6 +180,9 @@ want to understand that, read the section on auto-generated patterns in the TLPSRC.pm documentation (and don't forget to copy 00texlive.autopatterns.tlpsrc). +For more documentation concerning patterns and autopatterns, see the +POD documentation in TLPSRC.pm. + 4. Creating the TeX Live Database --------------------------------- @@ -203,6 +216,11 @@ Normally if there is an old tlpdb the packages in the new one are compared with the packages in the old one and checked that the revisions are increasing. +Passing in + -master ROOT +should allow you to run the script from an arbitrary directory, but +we recommend running it from within the ROOT folder. + As usual, please read the documentation of tl-update-tlpdb (again in POD) for further information. @@ -252,7 +270,7 @@ can create or update your web distribution with perl PATH-TO/tl-update-containers OPTIONS OPTIONS: --location DEST +-location NETROOT The -location gives the place where your former distribution was or where it should be created. In the former case only those containers with larger revision numbers are recreated. In the latter case all containers are @@ -277,12 +295,12 @@ tl-update-containers. ---------------------------- Having completed all these steps, you can test your distribution by calling the TeX Live Manager with the location argument. Continuing the above -example we use DEST: - tlmgr -location DEST update --list +example we use NETROOT: + tlmgr -location NETROOT update --list or - tlmgr -location DEST update --all + tlmgr -location NETROOT update --all or - tlmgr -location DEST list + tlmgr -location NETROOT list etc. Please see the documentation of tlmgr (POD again) for details. @@ -292,7 +310,7 @@ Since 2016 tlmgr is able to check cryptographic signatures and thus verify that the downloaded packages are what is distributed by the author/maintainer (you reading this document). -If you don't to sign, please pass +If you don't want to sign, please pass -no-sign to tl-update-containers above. -- cgit v1.2.3