Merge pull request #9349 from redeamer/fix_get_helm_runAsRoot_space_issue

fix(helm): get/get-helm-3 whitespace support in runAsRoot
5 years ago · fd5788ef0a
parent 8ad90b25e5 784782013a
commit fd5788ef0a
2 changed files with 8 additions and 12 deletions
--- a/scripts/get
+++ b/scripts/get
@ -50,13 +50,11 @@ initOS() {

 # runs the given command as root (detects if we are root already)
 runAsRoot() {
-  local CMD="$*"
-
-  if [ $EUID -ne 0 -a $USE_SUDO = "true" ]; then
-    CMD="sudo $CMD"
+  if [ $EUID -ne 0 -a "$USE_SUDO" = "true" ]; then
+    sudo "${@}"
+  else
+    "${@}"
  fi
-
-  $CMD
 }

 # verifySupported checks that the os/arch combination is supported for
--- a/scripts/get-helm-3
+++ b/scripts/get-helm-3
@ -57,13 +57,11 @@ initOS() {

 # runs the given command as root (detects if we are root already)
 runAsRoot() {
-  local CMD="$*"
-
-  if [ $EUID -ne 0 -a $USE_SUDO = "true" ]; then
-    CMD="sudo $CMD"
+  if [ $EUID -ne 0 -a "$USE_SUDO" = "true" ]; then
+    sudo "${@}"
+  else
+    "${@}"
  fi
-
-  $CMD
 }

 # verifySupported checks that the os/arch combination is supported for