Looks good, thanks :) Could you include the following tags before you push?
Fixes: 8ff569f ("Update release.sh script from Xorg") in the tags.
Fixes: 25535ca ("release.sh: Synchronize with changes made to
xf86-input-wacom's release.sh")
Also, I've got two other minor fixes (attached) that could also be
squashed into this patch if you'd like. Go ahead and add my
signed-off-by next to yours if you squash them.
Thanks!
Jason
---
Now instead of four in the eights place /
you’ve got three, ‘Cause you added one /
(That is to say, eight) to the two, /
But you can’t take seven from three, /
So you look at the sixty-fours....
On Tue, Mar 20, 2018 at 11:44 AM, Aaron Armstrong Skomra
<sko...@gmail.com> wrote:
> 1. Use correct filename variable (tarbz2 not tarball).
> 2. Insert spaces into heredoc to make links work for Gmail users.
> 3. The script greps the module url to see if it contains an
> approved repository. The first update to the release script
> contained a list of many approved repositories. Subsequent updates
> during the review process had these extra repositories removed.
> (git update-index --assume-unchanged release.sh can be used to
> temporarily use a different repository.) That second change
> removed
> -e "linuxwacom/.*" (Github)
> instead of
> -e "/linuxwacom/.*" (Sourceforge).
> Remove the slash which is not found in the Github path.
> 4. Remove the language about xorg, mesa, etc. from error message.
>
> Signed-off-by: Aaron Armstrong Skomra <sko...@gmail.com>
> ---
> release.sh | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/release.sh b/release.sh
> index d082b3809f22..d70a3437a073 100755
> --- a/release.sh
> +++ b/release.sh
> @@ -264,10 +264,10 @@ RELEASE
>
> cat <<RELEASE
> $DL_URL
> -MD5: `$MD5SUM $tarball`
> -SHA1: `$SHA1SUM $tarball`
> -SHA256: `$SHA256SUM $tarball`
> -PGP: $PGP_URL
> + MD5: `$MD5SUM $tarbz2`
> + SHA1: `$SHA1SUM $tarbz2`
> + SHA256: `$SHA256SUM $tarbz2`
> + PGP: $PGP_URL
>
> RELEASE
> }
> @@ -376,12 +376,12 @@ get_section() {
> module_url=`echo $module_url | cut -d'/' -f3,4`
> else
> # The look for mesa, xcb, etc...
> - module_url=`echo "$full_module_url" | $GREP -o -e "/linuxwacom/.*"`
> + module_url=`echo "$full_module_url" | $GREP -o -e "linuxwacom/.*"`
> if [ $? -eq 0 ]; then
> module_url=`echo $module_url | cut -d'/' -f2,3`
> else
> echo "Error: unable to locate a valid project url from
> \"$full_module_url\"."
> - echo "Cannot establish url as one of linuxwacom, xorg, mesa, xcb,
> xf86-video-nouveau, xkeyboard-config or wayland"
> + echo "Cannot establish url as linuxwacom"
> cd $top_src
> return 1
> fi
> --
> 2.7.4
>
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Linuxwacom-devel mailing list
> Linuxwacom-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
From 065bcff092bc3fe34f91830f698b26e8b9f4570b Mon Sep 17 00:00:00 2001
From: Jason Gerecke <killert...@gmail.com>
Date: Tue, 23 Jan 2018 11:57:50 -0800
Subject: [PATCH input-wacom] Correct release.sh script documentation
The release.sh script no longer has a `--user` option. The username is
now provided as a required argument of the `--github` and `--sourceforge`
options. Note that when using `--github`, a personal access token may
need to be appended to the username with a colon if two-factor auth is
used.
Fixes: 32c065ae02 ("add Github to release.sh script")
Signed-off-by: Jason Gerecke <jason.gere...@wacom.com>
---
release.sh | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/release.sh b/release.sh
index 3ca2f72..8975236 100755
--- a/release.sh
+++ b/release.sh
@@ -723,15 +723,16 @@ Usage: $basename [options] path...
Where "path" is a relative path to a git module, including '.'.
Options:
- --dist make 'dist' instead of 'distcheck'; use with caution
- --distcheck Default, ignored for compatibility
- --dry-run Does everything except tagging and uploading tarballs
- --force Force overwriting an existing release
- --help Display this help and exit successfully
- --modfile <file> Release the git modules specified in <file>
- --moduleset <file> The jhbuild moduleset full pathname to be updated
- --no-quit Do not quit after error; just print error message
- --user <name>@ Username of your fdo account if not configured in ssh
+ --dist make 'dist' instead of 'distcheck'; use with caution
+ --distcheck Default, ignored for compatibility
+ --dry-run Does everything except tagging and uploading tarballs
+ --force Force overwriting an existing release
+ --help Display this help and exit successfully
+ --modfile <file> Release the git modules specified in <file>
+ --moduleset <file> The jhbuild moduleset full pathname to be updated
+ --no-quit Do not quit after error; just print error message
+ --github <name[:pat]> Release project to Github with username / token
+ --sourceforge <name>@ Release project to Sourceforge with username
Environment variables defined by the "make" program and used by release.sh:
MAKE The name of the make command [make]
@@ -816,7 +817,7 @@ do
--no-quit)
NO_QUIT=yes
;;
- # Github username. Optional. Append colon and Personali
+ # Github username. Optional. Append colon and Personal
# Access Token to username if 2FA is enabled on the user
# account doing the release
--github)
--
2.16.2
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Linuxwacom-devel mailing list
Linuxwacom-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linuxwacom-devel
