CST-10 znick#336 Fixed help message request bug

mikhailyumanov · Mar 12, 2021 · e2fe199 · e2fe199
1 parent b14b894
commit e2fe199
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/deploy_local_beta/run.sh b/deploy_local_beta/run.sh
@@ -21,6 +21,7 @@
 ############
 
 ANYBETA_correct_args=1
+ANYBETA_help_requested=0
 
 while (( "$#" )); do
   ANYBETA_PARAM=`echo $1 | awk -F= '{ print $1 }'`
@@ -34,7 +35,8 @@ while (( "$#" )); do
 
     -h|--help)
       ANYBETA_usage
-      shift
+      ANYBETA_help_requested=1
+      shift "$#"
       ;;
 
     *)
@@ -45,7 +47,10 @@ while (( "$#" )); do
   esac
 done
 
-if test $ANYBETA_correct_args = 1
+if test $ANYBETA_help_requested = 0
 then
-  . $ANYBETA_DEPLOY/deploy_local_beta.sh "$@"
+  if test $ANYBETA_correct_args = 1
+  then
+    . $ANYBETA_DEPLOY/deploy_local_beta.sh "$@"
+  fi
 fi
diff --git a/deploy_local_beta/settings.sh b/deploy_local_beta/settings.sh
@@ -70,6 +70,7 @@ function ANYBETA_cleanup() {
   unset ANYBETA_ERROR_PREFIX
   unset ANYBETA_SAVE_VENV
   unset ANYBETA_correct_args
+  unset ANYBETA_help_requested
 
   unset ANYBETA_report
   unset ANYBETA_error