Unify the usage function.
Reword and unify the comment lines.
Capitalize and use a better name for variables.
- Correct blank line
Signed-off-by: Matt Darfeuille <matd...@gmail.com>
---
build/release | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
diff --git a/build/release b/build/release
index 35a34055..c8500e71 100644
--- a/build/release
+++ b/build/release
@@ -26,14 +26,14 @@
# release [ <OPTIONS> ] <VERSION>
#
# Script to create signed tag for new Shorewall release.
-# The signed tag is to be created
-# in the code and release repository.
+# The signed tag is to be created in both
+# the code and release repositories.
# If both options -c and -r are not given
-# the default value of the 'git tag' command will be used.
+# the default value of the 'git tag' command will be used.
# The -B option will attempt to determine automatically
# the branch that needs to be checked out.
# The default value for the -B option is master.
-# The -b option will checkout the given branch.
+# The -b option will checkout the given branch.
# The -p option will push the newly created tags.
#
################################################################################
@@ -70,8 +70,8 @@ usage()
echo "Usage: $me [ <OPTIONS> ] <VERSION>."
echo "Where <OPTIONS> is one of:"
- echo " -c -- Object that the new tag will refer to (code repository)."
- echo " -r -- Object that the new tag will refer to (release repository)."
+ 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."
@@ -235,7 +235,7 @@ while [ $finished -eq 0 -a $# -gt 0 ]; do
option=
;;
u*)
- upload=Yes
+ EXECUTE_UPLOAD_SCRIPT=Yes
option=${option#u}
;;
a*)
@@ -288,7 +288,6 @@ if [ -n "$MESSAGE" ]; then
[ -n "$APPEND_VERSION" ] && MESSAGE="$MESSAGE $VERSION"
fi
-
case $VERSION in
5.1.*|5.1.*.*)
;;
@@ -317,7 +316,7 @@ else
create_tag $GITRELEASEDIR $GIT_RELEASE_OBJECT
fi
-if [ -n "$upload" ]; then
+if [ -n "$EXECUTE_UPLOAD_SCRIPT" ]; then
[ -f $TOOLSDIR/upload ] && $TOOLSDIR/upload $VERSION
fi
--
2.13.2
------------------------------------------------------------------------------
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
Shorewall-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shorewall-devel
