minor fixes

getupcloud · Jun 18, 2024 · 288c180 · 288c180
1 parent 3d74670
commit 288c180
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/root/etc/profile.d/getup.sh b/root/etc/profile.d/getup.sh
@@ -244,9 +244,11 @@ function get_tf_config()
     case "$(hcl2json "$TF_VARS_FILE" | jq -Mrc ".${tf_var_name}|type")" in
         string|number|object)
             hcl2json "$TF_VARS_FILE" | jq -Mrc ".${tf_var_name}"
+            return
         ;;
         array)
             hcl2json "$TF_VARS_FILE" | jq -Mrc ".${tf_var_name}|join(\"\n\")"
+            return
     esac
 
     echo $default

diff --git a/root/usr/local/bin/kubespray-apply b/root/usr/local/bin/kubespray-apply
@@ -4,7 +4,7 @@ set -eu
 
 source /etc/profile.d/getup.sh
 
-if [[ "$1" =~ (-h|--help) ]] ; then
+if [ $# -gt 0 ] && [[ "$1" =~ (-h|--help) ]] ; then
     echo "Usage: $0 [ansible-playbook parameters...]"
     exit 1
 fi