(daffodil) branch main updated: Minor fixes to the release candidate container script

[slawrence]

This is an automated email from the ASF dual-hosted git repository.

slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git


The following commit(s) were added to refs/heads/main by this push:
     new cff263bf4 Minor fixes to the release candidate container script
cff263bf4 is described below

commit cff263bf49a42549abba2e7e070fffc4ad240d95
Author: Steve Lawrence <slawre...@apache.org>
AuthorDate: Wed Aug 21 07:44:42 2024 -0400

    Minor fixes to the release candidate container script
    
    Add additional changes to commit a13501a90d to improve the release
    candidate container.
    
    - Appends a colon and space to the prompt in the get_non_empty_input
      function instead of in caller parameters. The callers did already add
      a colon but not a space so the input looked off. This ensures the
      colon and space always exist and callers do not have to think about it
    - The "Apache Password" prompt does not provide the "-s" option to hide
      the password. This modifies get_non_empty_input so that any parameters
      after the prompt are passed directly to "read" and the "Apache
      Password" call is modified to pass in "-s"
    
    DAFFODIL-2914
---
 .../release-candidate/src/daffodil-release-candidate      | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/containers/release-candidate/src/daffodil-release-candidate 
b/containers/release-candidate/src/daffodil-release-candidate
index 583cd032e..a220af08b 100755
--- a/containers/release-candidate/src/daffodil-release-candidate
+++ b/containers/release-candidate/src/daffodil-release-candidate
@@ -47,13 +47,16 @@ USAGE
 }
 
 # Function to get a non-empty string as input
+# $1 is the prompt to use
+# $2 to $N are passed directly to the read command
 get_non_empty_input() {
     local prompt="$1" # prompt the user with this string
+    shift
     local input
 
     while true; do
         # Prompt the user for input
-        read -p "$prompt" input
+        read -p "$prompt: " "$@" input
 
         # Check if the input is non-empty
         if [[ -n $input ]]; then
@@ -172,11 +175,11 @@ done
 
 echo
 
-PRE_RELEASE=$(get_non_empty_input "Pre Release label (e.g., rc1 to rc99):")
-GIT_COMMIT_NAME=$(get_non_empty_input "Git Commit Name (e.g., 'John Q. 
Smith'):")
-GIT_COMMIT_EMAIL=$(get_non_empty_input "Git Commit Email:")
-APACHE_USERNAME=$(get_non_empty_input "Apache Username:")
-APACHE_PASSWD=$(get_non_empty_input "Apache Password:")
+PRE_RELEASE=$(get_non_empty_input "Pre Release label (e.g., rc1 to rc99)")
+GIT_COMMIT_NAME=$(get_non_empty_input "Git Commit Name (e.g., 'John Q. 
Smith')")
+GIT_COMMIT_EMAIL=$(get_non_empty_input "Git Commit Email")
+APACHE_USERNAME=$(get_non_empty_input "Apache Username")
+APACHE_PASSWD=$(get_non_empty_input "Apache Password" -s)
 
 echo
 echo