release.sh: add signing and fix outdated commands

Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Andrey Albershteyn <aalbersh@kernel.org>

diff --git a/release.sh b/release.sh
index 577257a354d442e1cc0a2b9381b11ffbe2f64a71..ea08ab334954e5b8aa40278a40cf7aceec2488cc 100755 (executable)
--- a/release.sh
+++ b/release.sh
@@ -9,6 +9,8 @@
 # configure.ac (with new version string)
 # debian/changelog (with new release entry, only for release version)
 
+set -e
+
 . ./VERSION
 
 version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
@@ -16,21 +18,42 @@ date=`date +"%-d %B %Y"`
 
 echo "Cleaning up"
 make realclean
+rm -rf "xfsprogs-${version}.tar" \
+       "xfsprogs-${version}.tar.gz" \
+       "xfsprogs-${version}.tar.asc" \
+       "xfsprogs-${version}.tar.sign"
 
 echo "Updating CHANGES"
 sed -e "s/${version}.*/${version} (${date})/" doc/CHANGES > doc/CHANGES.tmp && \
        mv doc/CHANGES.tmp doc/CHANGES
 
 echo "Commiting CHANGES update to git"
-git commit -a -m "${version} release"
+git commit --all --signoff --message="xfsprogs: Release v${version}
+
+Update all the necessary files for a v${version} release."
 
 echo "Tagging git repository"
-git tag -a -m "${version} release" v${version}
+git tag --annotate --sign --message="Release v${version}" v${version}
 
 echo "Making source tarball"
 make dist
-
-#echo "Sign the source tarball"
-#gpg --detach-sign xfsprogs-${version}.tar.gz
-
-echo "Done.  Please remember to push out tags using \"git push --tags\""
+gunzip -k "xfsprogs-${version}.tar.gz"
+
+echo "Sign the source tarball"
+gpg \
+       --detach-sign \
+       --armor \
+       "xfsprogs-${version}.tar"
+
+echo "Verify signature"
+gpg \
+       --verify \
+       "xfsprogs-${version}.tar.asc"
+if [ $? -ne 0 ]; then
+       echo "Can not verify signature of tarball"
+       exit 1
+fi
+
+mv "xfsprogs-${version}.tar.asc" "xfsprogs-${version}.tar.sign"
+
+echo "Done. Please remember to push out tags using \"git push origin v${version}\""