Signed-off-by: Matt Darfeuille <[email protected]>
---
build/release | 35 ++++++++++-------------------------
1 file changed, 10 insertions(+), 25 deletions(-)
diff --git a/build/release b/build/release
index 4f5c508f..d5e707fe 100755
--- a/build/release
+++ b/build/release
@@ -36,7 +36,6 @@
# are given -B is assumed.
# The default branch for the -B option is master.
# The -b option will checkout the given branch.
-# The -p option will push the newly created tags.
#
################################################################################
# C O N F I G U R A T I O N
@@ -76,10 +75,8 @@ usage()
echo " -c <OBJECT> -- Object that the new tag will refer to (code
repository)."
echo " -r <OBJECT> -- Object that the new tag will refer to (release
repository)."
echo " -a -- Append <VERSION> to the end of the message tag."
- echo " -u -- Execute the upload script."
echo " -B -- Automatically determine which branch to checkout (default)."
echo " -b <BRANCHNAME> -- Checkout the given branch."
- echo " -p -- Push the newly created tags."
echo "Where <VERSION> is:"
echo " <VERSION> -- Version for the new tag name."
@@ -229,10 +226,6 @@ while [ $finished -eq 0 -a $# -gt 0 ]; do
option=
;;
- u*)
- EXECUTE_UPLOAD_SCRIPT=Yes
- option=${option#u}
- ;;
a*)
APPEND_VERSION=Yes
option=${option#v}
@@ -257,10 +250,6 @@ while [ $finished -eq 0 -a $# -gt 0 ]; do
option=
;;
- p*)
- PUSH_TAG=Yes
- option=${option#p}
- ;;
*)
usage
;;
@@ -328,18 +317,14 @@ else
create_tag $GITRELEASEDIR $GIT_RELEASE_OBJECT
fi
-if [ -n "$EXECUTE_UPLOAD_SCRIPT" ]; then
- case $VERSION in
- *[bB]ase*)
- [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $BASEVERSION
- ;;
- *)
- [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $VERSION
- ;;
- esac
-fi
+case $VERSION in
+ *[bB]ase*)
+ [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $BASEVERSION
+ ;;
+ *)
+ [ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $VERSION
+ ;;
+esac
-if [ -n "$PUSH_TAG" ]; then
- push_tag_func $GIT
- push_tag_func $GITRELEASEDIR
-fi
+push_tag_func $GIT
+push_tag_func $GITRELEASEDIR
--
2.14.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Shorewall-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
