From a35e76aded095d61ea290b08443bfb6e22e3b088 Mon Sep 17 00:00:00 2001 From: Tony Vroon Date: Sun, 22 May 2011 14:35:55 -0400 Subject: [PATCH] makerelease.sh: Do things the git way; add a sanity check for release name. --- scripts/makerelease.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/makerelease.sh b/scripts/makerelease.sh index 7b3fc276..ad5a33da 100755 --- a/scripts/makerelease.sh +++ b/scripts/makerelease.sh @@ -1,7 +1,7 @@ #!/bin/sh # mkrelease.sh: Creates a release suitable for distfiles.atheme.org. # -# Copyright (c) 2007 atheme.org +# Copyright (c) 2007, 2011 atheme.org # # Permission to use, copy, modify, and/or distribute this software for # any purpose with or without fee is hereby granted, provided that the above @@ -23,14 +23,20 @@ if [ "x$1" = "x" ]; then echo "usage: $0 releasename [--automatic]" exit else + PROGRAM=`pwd | sed "s:/scripts::" | awk -F/ '{print $NF}'` RELEASENAME="$1" fi +if [[ $1 != $PROGRAM* ]]; then + echo "example: $0 $PROGRAM-1.2.3" + exit +fi + if [ "x$2" = "x--automatic" ]; then AUTOMATIC="yes" fi -TIP=`hg parents --template "{rev}:{node|short}"` +TIP=`git log -1 --pretty=oneline | cut -d" " -f1` WRKDIR=`pwd` @@ -43,10 +49,11 @@ echo "Making release named $RELEASENAME (tip $TIP)" echo echo "Building root: $RELEASENAME/" -hg archive $RELEASENAME +git archive $RELEASENAME cd $RELEASENAME sh autogen.sh rm -rf autogen.sh autom4te.cache +rm -rf .gitignore # Run application specific instructions here. if [ -x "$WRKDIR/application.sh" ]; then @@ -95,6 +102,6 @@ fi echo echo "Done. If you have any bugs to report, report them against" -echo "the distfiles.atheme.org component at http://bugzilla.atheme.org" +echo "the distfiles.atheme.org component at http://jira.atheme.org" echo "Thanks!" echo