On 9/3/21 1:28 PM, ic...@apache.org wrote:
> Author: icing
> Date: Fri Sep 3 11:28:23 2021
> New Revision: 1892852
>
> URL: http://svn.apache.org/viewvc?rev=1892852&view=rev
> Log:
> * all scripts have a -h option
> * make-tars.sh has option "-s user" to specify the pgp/gpg siging user
> * push-tars.sh prepares the distribution of the tars for apache.org
> - creates/modifies CHANGES and Announcement
> - ask for confirmation before "svn commit" of changes
> - preps a voting email
>
>
> Added:
> httpd/dev-tools/v2/push-tars.sh
> Modified:
> httpd/dev-tools/v2/common-lib.sh
> httpd/dev-tools/v2/make-candidate.sh
> httpd/dev-tools/v2/make-tars.sh
>
>
> Modified: httpd/dev-tools/v2/make-tars.sh
> URL:
> http://svn.apache.org/viewvc/httpd/dev-tools/v2/make-tars.sh?rev=1892852&r1=1892851&r2=1892852&view=diff
> ==============================================================================
> --- httpd/dev-tools/v2/make-tars.sh (original)
> +++ httpd/dev-tools/v2/make-tars.sh Fri Sep 3 11:28:23 2021
> @@ -21,23 +21,34 @@ set -e
>
> usage () {
> cat <<EOF 1>&2
> -usage: $0 [version [signing-user]]
> - create the release tars from a SVN candidate. The candidate is exported
> - to the local dist directory from 'tags/candidate-$version', prepped
> - (buildconf, depending srclib, etc.) and then made into tarballs with
> - checksums and signatures.
> - Options:
> +usage: $0 [options] [version]
> + create the release tars from a SVN candidate. The candidate is expected
> + to be found in SVN at 'tags/candidate-$version', as prepared by the
> + 'make-candidate.sh' script.
> + If no version is given, the current version in the checkout is used.
> + Arguments:
> version as 'm.n.p(-suffix)?', the version to use.
> - signing-user the gpg2/gpg/pgp identity used for signing
> + Options:
> + -h print usage information
> + -s sign-user use gpg/pgp key from 'sign-user'
> EOF
> exit 1
> }
>
> source `dirname $0`/common-lib.sh
>
> +signing_user=
> +while getopts "hy" opt; do
Shouldn't this be hs instead of hy ?
> + case $opt in
> + h) usage
> + ;;
> + s) signing_user="$OPTARG"
> + ;;
> + esac
> +done
> +
> detect_checkout
> detect_version $1
> -signing_user=$2
>
> PROJECT=`basename $SVN_BASE`
> SVN_DEST="tags/candidate-${VERSION}"
>
Regards
RĂ¼diger