Updated Branches: refs/heads/4.1 2c36aa8fc -> 512234321
More build script fixes Signed-off-by: Chip Childers <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/51223432 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/51223432 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/51223432 Branch: refs/heads/4.1 Commit: 5122343215f1c352b5221564bb61dcb83b000c06 Parents: 2c36aa8 Author: Chip Childers <[email protected]> Authored: Sun Apr 21 15:42:30 2013 -0400 Committer: Chip Childers <[email protected]> Committed: Sun Apr 21 15:42:30 2013 -0400 ---------------------------------------------------------------------- tools/build/build_asf.sh | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51223432/tools/build/build_asf.sh ---------------------------------------------------------------------- diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index 848747c..9db6171 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -25,13 +25,13 @@ certid='X' committosvn='X' usage(){ - echo "usage: $0 -v version [-b branch] [-s source dir] [-o output dir] [-t [-u]] [-c] [-h]" + echo "usage: $0 -v version [-b branch] [-s source dir] [-o output dir] [-t] [-u] [-c] [-h]" echo " -v sets the version" echo " -b sets the branch (defaults to 'master')" echo " -s sets the source directory (defaults to $sourcedir)" echo " -o sets the output directory (defaults to $outputdir)" echo " -t tags the git repo with the version" - echo " -u sets the certificate ID to sign the tag with (if not provided, the default key is attempted)" + echo " -u sets the certificate ID to sign with (if not provided, the default key is attempted)" echo " -c commits build artifacts to cloudstack dev dist dir in svn" echo " -h" } @@ -55,7 +55,7 @@ do done shift `expr $OPTIND - 1` -if [ $version == 'TESTBUILD' ]; then +if [ $version == "TESTBUILD" ]; then echo >&2 "A version must be specified with the -v option: build_asf.sh -v 4.0.0.RC1" exit 1 fi @@ -64,8 +64,8 @@ echo "Using version: $version" echo "Using source directory: $sourcedir" echo "Using output directory: $outputdir" echo "Using branch: $branch" -if [ "$tag" == 'yes' ]; then - if [ "$certid" == 'X' ]; then +if [ "$tag" == "yes" ]; then + if [ "$certid" == "X" ]; then echo "Tagging the branch with the version number, and signing the branch with your default certificate." else echo "Tagging the branch with the version number, and signing the branch with certificate ID $certid." @@ -107,7 +107,7 @@ bzip2 $outputdir/apache-cloudstack-$version-src.tar cd $outputdir echo 'armor' -if ["$certid" == 'X' ]; then +if [ "$certid" == "X" ]; then gpg -v --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 else gpg -v --default-key $certid --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 @@ -122,17 +122,17 @@ gpg -v --print-md SHA512 apache-cloudstack-$version-src.tar.bz2 > apache-cloudst echo 'verify' gpg -v --verify apache-cloudstack-$version-src.tar.bz2.asc apache-cloudstack-$version-src.tar.bz2 -if [ "$tag" == 'yes' ]; then +if [ "$tag" == "yes" ]; then echo 'tag' cd $sourcedir - if [ "$certid" == 'X' ]; then + if [ "$certid" == "X" ]; then git tag -s $version -m "Tagging release $version on branch $branch." else git tag -u $certid -s $version -m "Tagging release $version on branch $branch." fi fi -if ["$committosvn" == 'yes' ]; then +if [ "$committosvn" == "yes" ]; then echo 'committing artifacts to svn' rm -Rf /tmp/cloudstack-dev-dist cd /tmp
