Fixes for local cache binaries

Xtigyro · Oct 12, 2020 · 5bbdcfd · 5bbdcfd
1 parent d8fe47c
commit 5bbdcfd
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/local-cluster/setup.sh b/local-cluster/setup.sh
@@ -72,8 +72,11 @@ mkdir -p "$CACHE_DIR"
 if ! `"$EXEC_DIR"/kubectl version --client=true 2>/dev/null | grep -q "$KUBECTL_VERSION"` ; then
  if ! `"$CACHE_DIR"/kubectl version --client=true 2>/dev/null | grep -q "$KUBECTL_VERSION"` ; then
  echo -e "\nDownloading kubectl binary..." && \
- curl -L https://storage.googleapis.com/kubernetes-release/release/v"$KUBECTL_VERSION"/bin/linux/amd64/kubectl -o "$CACHE_DIR"/kubectl && \
- chmod +x "$CACHE_DIR"/kubectl
+ curl -L https://storage.googleapis.com/kubernetes-release/release/v"$KUBECTL_VERSION"/bin/linux/amd64/kubectl -o "$CACHE_DIR"/kubectl-"$KUBECTL_VERSION" && \
+ chmod +x "$CACHE_DIR"/kubectl-"$KUBECTL_VERSION"
+ yes | cp "$CACHE_DIR"/kubectl-"$KUBECTL_VERSION" "$CACHE_DIR"/kubectl
+ else
+ yes | cp "$CACHE_DIR"/kubectl-"$KUBECTL_VERSION" "$CACHE_DIR"/kubectl
  fi
  if [[ "$SYS_WIDE" == "true" ]] ; then
  yes | sudo cp "$CACHE_DIR"/kubectl "$EXEC_DIR/kubectl" >/dev/null 2>&1
@@ -128,8 +131,11 @@ fi
 if ! `"$EXEC_DIR"/helmfile -v 2>/dev/null | grep -q "$HELMFILE_VER"` ; then
  if ! `"$CACHE_DIR"/helmfile -v 2>/dev/null | grep -q "$HELMFILE_VER"` ; then
  echo -e "\nDownloading Helmfile binary..." && \
- curl -L https://github.com/roboll/helmfile/releases/download/v"$HELMFILE_VER"/helmfile_linux_amd64 -o "$CACHE_DIR"/helmfile && \
- chmod +x "$CACHE_DIR"/helmfile
+ curl -L https://github.com/roboll/helmfile/releases/download/v"$HELMFILE_VER"/helmfile_linux_amd64 -o "$CACHE_DIR"/helmfile-"$HELMFILE_VER" && \
+ chmod +x "$CACHE_DIR"/helmfile-"$HELMFILE_VER"
+ yes | cp "$CACHE_DIR"/helmfile-"$HELMFILE_VER" "$CACHE_DIR"/helmfile
+ else
+ yes | cp "$CACHE_DIR"/helmfile-"$HELMFILE_VER" "$CACHE_DIR"/helmfile
  fi
  if [[ "$SYS_WIDE" == "true" ]] ; then
  yes | sudo cp "$CACHE_DIR"/helmfile "$EXEC_DIR"/helmfile >/dev/null 2>&1
@@ -145,8 +151,11 @@ fi
 if ! `"$EXEC_DIR"/kind version 2>/dev/null | grep -q "$KIND_VERSION"` ; then
  if ! `"$CACHE_DIR"/kind version 2>/dev/null | grep -q "$KIND_VERSION"` ; then
  echo -e "\nDownloading kINd binary..." && \
- curl -L https://github.com/kubernetes-sigs/kind/releases/download/v"$KIND_VERSION"/kind-$(uname)-amd64 -o "$CACHE_DIR"/kind && \
- chmod +x "$CACHE_DIR"/kind
+ curl -L https://github.com/kubernetes-sigs/kind/releases/download/v"$KIND_VERSION"/kind-$(uname)-amd64 -o "$CACHE_DIR"/kind-"$KIND_VERSION" && \
+ chmod +x "$CACHE_DIR"/kind-"$KIND_VERSION"
+ yes | cp "$CACHE_DIR"/kind-"$KIND_VERSION" "$CACHE_DIR"/kind
+ else
+ yes | cp "$CACHE_DIR"/kind-"$KIND_VERSION" "$CACHE_DIR"/kind
  fi
  if [[ "$SYS_WIDE" == "true" ]] ; then
  yes | sudo cp "$CACHE_DIR"/kind "$EXEC_DIR"/kind >/dev/null 2>&1