git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
76467dc
)
release-scripts/create-tarball: always create a tag in form of samba-${version}
author
Stefan Metzmacher
<metze@samba.org>
Tue, 28 Jun 2011 10:52:37 +0000
(12:52 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Thu, 30 Jun 2011 15:12:05 +0000
(17:12 +0200)
metze
release-scripts/create-tarball
patch
|
blob
|
history
diff --git
a/release-scripts/create-tarball
b/release-scripts/create-tarball
index 213e35e36e89989f24cddd7979b33ccc24be1d27..e6a515f48a646c57777c983c4b7895695000871b 100755
(executable)
--- a/
release-scripts/create-tarball
+++ b/
release-scripts/create-tarball
@@
-3,7
+3,6
@@
## option defaults
OPT_BRANCH=""
OPT_DOCSDIR=""
## option defaults
OPT_BRANCH=""
OPT_DOCSDIR=""
-OPT_TAG=""
OPT_KEYID=""
TOPDIR="`dirname $0`/.."
OPT_KEYID=""
TOPDIR="`dirname $0`/.."
@@
-32,7
+31,6
@@
function printUsage
echo " --help Print command usage"
echo " --branch <name> Specify the branch to to create the archive file from"
echo " --copy-docs <dir> Copy documentation from <dir> rather than building"
echo " --help Print command usage"
echo " --branch <name> Specify the branch to to create the archive file from"
echo " --copy-docs <dir> Copy documentation from <dir> rather than building"
- echo " --tag <name> Tag name for release"
echo " --keyid <email> The GnuPG key ID used to sign the release tag"
echo ""
}
echo " --keyid <email> The GnuPG key ID used to sign the release tag"
echo ""
}
@@
-67,15
+65,6
@@
function parseOptions
OPT_DOCSDIR="$1"
shift
;;
OPT_DOCSDIR="$1"
shift
;;
- --tag)
- shift
- if [ -z "$1" ]; then
- printUsage
- return 1
- fi
- OPT_TAG="$1"
- shift
- ;;
--keyid)
shift
if [ -z "$1" ]; then
--keyid)
shift
if [ -z "$1" ]; then
@@
-145,13
+134,10
@@
function buildDocs
##
function createReleaseTag
{
##
function createReleaseTag
{
- if [ -z "${OPT_TAG}" ]; then
- echo "Tagging disabled"
- return 0
- fi
+ tagname="$1"
- if [ "x`git tag -l ${
OPT_TAG
}`" != "x" ]; then
- echo -n "Tag exists. Do you wish to overwrite? (y/N): "
+ if [ "x`git tag -l ${
tagname
}`" != "x" ]; then
+ echo -n "Tag
'${tagname}'
exists. Do you wish to overwrite? (y/N): "
read answer
if [ "x$answer" != "xy" ]; then
read answer
if [ "x$answer" != "xy" ]; then
@@
-168,8
+154,8
@@
function createReleaseTag
fi
fi
fi
fi
- git tag -u ${OPT_KEYID} ${
OPT_TAG
}
- exitOnError $? "Failed to create tag"
+ git tag -u ${OPT_KEYID} ${
tagname
}
+ exitOnError $? "Failed to create tag
'${tagname}'
"
return 0
}
return 0
}
@@
-239,7
+225,7
@@
function main
popd
popd
- createReleaseTag
+ createReleaseTag
"samba-${version}"
exitOnError $? "Failed to create release tag"
return 0
exitOnError $? "Failed to create release tag"
return 0