[phoenix-queryserver] branch master updated: PHOENIX-6803 make_rc.sh does not work on mac (#108)

[ri...@apache.org]

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

richardantal pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git


The following commit(s) were added to refs/heads/master by this push:
     new bcad14b  PHOENIX-6803 make_rc.sh does not work on mac (#108)
bcad14b is described below

commit bcad14bdfe4b3db5f123c201ef5f01d0f5bda9c0
Author: richardantal <ri...@apache.org>
AuthorDate: Tue Oct 4 16:22:40 2022 +0200

    PHOENIX-6803 make_rc.sh does not work on mac (#108)
---
 python-phoenixdb/NEWS.rst               | 1 +
 python-phoenixdb/RELEASING.rst          | 2 +-
 python-phoenixdb/dev-support/make_rc.sh | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/python-phoenixdb/NEWS.rst b/python-phoenixdb/NEWS.rst
index 8315636..a9d195e 100644
--- a/python-phoenixdb/NEWS.rst
+++ b/python-phoenixdb/NEWS.rst
@@ -5,6 +5,7 @@ Version 1.2.1
 -------------
 - Defined authentication mechanism for SPNEGO explicitly (PHOENIX-6781)
 - Fixed failing docker build because of missing files (PHOENIX-6801)
+- Fixed make_rc.sh script on mac (PHOENIX-6803)
 - Fixed flaky tests
 
 Version 1.2.0
diff --git a/python-phoenixdb/RELEASING.rst b/python-phoenixdb/RELEASING.rst
index 8571018..400efb8 100644
--- a/python-phoenixdb/RELEASING.rst
+++ b/python-phoenixdb/RELEASING.rst
@@ -38,7 +38,7 @@ Prepare the RC
 #. Run the dev_support/make_rc.sh script, and choose the option to tag the release::
 
     cd python-phoenixdb
-    ./dev/support/make_rc.sh
+    ./dev-support/make_rc.sh
 
 #. The distribution will be generated under the python-phoenixdb/release directory. Upload the directory to https://dist.apache.org/repos/dist/dev/phoenix/ with SVN::
 
diff --git a/python-phoenixdb/dev-support/make_rc.sh b/python-phoenixdb/dev-support/make_rc.sh
index c1ece74..8024947 100755
--- a/python-phoenixdb/dev-support/make_rc.sh
+++ b/python-phoenixdb/dev-support/make_rc.sh
@@ -26,14 +26,14 @@ echo "Presumes that you can sign a release as described at https://www.apache.or
 echo ""
 echo "Continuing will overwrite all uncommitted changes under the phoenix-queryserver repository."
 
-read -p "Y to continue or any other key to quit" prompt
+read -p "Y to continue or any other key to quit " prompt
 if [[ ! $prompt =~ [yY](es)* ]]
 then
   echo "Aborting."
   exit
  fi
 
-echo "Starting...";sleep 2s
+echo "Starting...";sleep 2
 
 # Set directory variables
 DIR_ROOT="$(cd $(dirname $0);pwd)/.."
@@ -80,12 +80,12 @@ function_sign() {
 cd $DIR_REL_SRC_TAR_PATH; function_sign;
 
 # Tag
-read -p "Do you want add tag for this RC in GIT? (Y for yes or any other key to continue)" prompt
+read -p "Do you want add tag for this RC in GIT? (Y for yes or any other key to continue) " prompt
 if [[ $prompt =~ [yY](es)* ]]
 then
   echo "Tagging..."
   read -p "Enter tag (Example python-phoenixdb-1.0.0.rc0):" prompt
-  echo "Setting tag: $prompt";sleep 5s
+  echo "Setting tag: $prompt";sleep 5
   git tag -a $prompt -m "$prompt"; git push origin $prompt
   mv $DIR_REL_ROOT $DIR_REL_BASE/$prompt
 fi