release script simplifications

release.sh

@@ -44,19 +44,6 @@ check_local_changes() {
     return 0
 }
 
-#------------------------------------------------------------------------------
-#                        Function: check_modules_specification
-#------------------------------------------------------------------------------
-#
-check_modules_specification() {
-    if [ x"${INPUT_MODULES}" = x ]; then
-        echo ""
-        echo "Error: no modules specified (blank command line)."
-        usage
-        exit 1
-    fi
-}
-
 #------------------------------------------------------------------------------
 #                        Function: check_json_message
 #------------------------------------------------------------------------------
@@ -176,19 +163,19 @@ RELEASE
 print_epilog() {
 
     epilog="========  Successful Completion"
-    if [ x"$NO_QUIT" != x ]; then
-        if [ x"$failed_modules" != x ]; then
+    if [ -n "$NO_QUIT" ]; then
+        if [ -n "$failed_modules" ]; then
             epilog="========  Partial Completion"
         fi
-    elif [ x"$failed_modules" != x ]; then
+    elif [ -n "$failed_modules" ]; then
         epilog="========  Stopped on Error"
     fi
 
     echo ""
     echo "$epilog `date`"
 
     # Report about modules that failed for one reason or another
-    if [ x"$failed_modules" != x ]; then
+    if [ -n "$failed_modules" ]; then
         echo "        List of failed modules:"
         for mod in $failed_modules; do
             echo "        $mod"
@@ -210,7 +197,7 @@ process_modules() {
         if ! process_module ; then
             echo "Error: processing module \"$MODULE_RPATH\" failed."
             failed_modules="$failed_modules $MODULE_RPATH"
-            if [ x"$NO_QUIT" = x ]; then
+            if [ -z "$NO_QUIT" ]; then
                 print_epilog
                 exit 1
             fi
@@ -261,7 +248,7 @@ get_section() {
         return 1
     fi
 
-    if [ x"$section" = xlinuxwacom ]; then
+    if [ "$section" = "linuxwacom" ]; then
         section=`echo $module_url | cut -d'/' -f2`
         if [ $? -ne 0 ]; then
             echo "Error: unable to extract section from $module_url second field."
@@ -350,7 +337,7 @@ process_module() {
         echo "Error: failed to locate $buildfile."
         echo "Has the module been configured?"
         return 1
-    elif [ x"$configNum" != x1 ]; then
+    elif [ "$configNum" != "1" ]; then
         echo "Error: more than one $buildfile file was found,"
         echo "       clean-up previously failed attempts at distcheck"
         return 1
@@ -466,7 +453,7 @@ process_module() {
         cd $top_src
         return 1
     fi
-    if [ x"$remote_top_commit_sha" != x"$local_top_commit_sha" ]; then
+    if [ "$remote_top_commit_sha" != "$local_top_commit_sha" ]; then
         echo "Error: the local top commit has not been pushed to the remote."
         local_top_commit_descr=`git log --oneline --max-count=1 $local_top_commit_sha`
         echo "       the local top commit is: \"$local_top_commit_descr\""
@@ -479,7 +466,7 @@ process_module() {
     tagged_commit_sha=`git  rev-list --max-count=1 $tag_name 2>/dev/null`
     if [ $? -eq 0 ]; then
         # Check if the tag is pointing to the top commit
-        if [ x"$tagged_commit_sha" != x"$remote_top_commit_sha" ]; then
+        if [ "$tagged_commit_sha" != "$remote_top_commit_sha" ]; then
             echo "Error: the \"$tag_name\" already exists."
             echo "       this tag is not tagging the top commit."
             remote_top_commit_descr=`git log --oneline --max-count=1 $remote_top_commit_sha`
@@ -493,7 +480,7 @@ process_module() {
         fi
     else
         # Tag the top commit with the tar name
-        if [ x"$DRY_RUN" = x ]; then
+        if [ -z "$DRY_RUN" ]; then
             git tag -s -m $tag_name $tag_name
             if [ $? -ne 0 ]; then
                 echo "Error:  unable to tag module with \"$tag_name\"."
@@ -541,7 +528,7 @@ process_module() {
             echo "         Please check the commit history in the announce."
         fi
     fi
-    if [ x"$tag_previous" != x ]; then
+    if [ -n "$tag_previous" ]; then
         # The top commit may not have been tagged in dry-run mode. Use commit.
         tag_range=$tag_previous..$local_top_commit_sha
     else
@@ -588,17 +575,15 @@ usage() {
     basename="`expr "//$0" : '.*/\([^/]*\)'`"
     cat <<HELP
 
-Usage: $basename [options] path...
+Usage: $basename [options] [path...]
 
-Where "path" is a relative path to a git module, including '.'.
+Where "path" is a relative path to a git module, including '.' (the default).
 
 Options:
   --dist                 make 'dist' instead of 'distcheck'; use with caution
   --distcheck            Default, ignored for compatibility
   --dry-run              Does everything except tagging and uploading tarballs
-  --force                Force overwriting an existing release
   --help                 Display this help and exit successfully
-  --moduleset <file>     The jhbuild moduleset full pathname to be updated
   --no-quit              Do not quit after error; just print error message
   --token <tokenval>     GitHub personal access token value
 
@@ -621,7 +606,7 @@ MAKE=${MAKE:="make"}
 check_for_jq
 
 # Choose which grep program to use (on Solaris, must be gnu grep)
-if [ "x$GREP" = "x" ] ; then
+if [ -z "$GREP" ] ; then
     if [ -x /usr/gnu/bin/grep ] ; then
         GREP=/usr/gnu/bin/grep
     else
@@ -630,7 +615,7 @@ if [ "x$GREP" = "x" ] ; then
 fi
 
 # Find path for GnuPG v2
-if [ "x$GPG" = "x" ] ; then
+if [ -z "$GPG" ] ; then
     if [ -x /usr/bin/gpg2 ] ; then
         GPG=/usr/bin/gpg2
     else
@@ -659,11 +644,6 @@ do
     --dry-run)
         DRY_RUN=yes
         ;;
-    # Force overwriting an existing release
-    # Use only if nothing changed in the git repo
-    --force)
-        FORCE=yes
-        ;;
     # Display this help and exit successfully
     --help)
         usage
@@ -701,7 +681,11 @@ do
 done
 
 # If no modules specified (blank cmd line) display help
-check_modules_specification
+if [ -z "$INPUT_MODULES" ]; then
+    echo ""
+    echo "No modules specified, using \$PWD."
+    INPUT_MODULES=" ."
+fi
 
 # Loop through each module to release
 # Exit on error if --no-quit no specified