Merge branch 'main' into releases/ubuntu16/20200901-docs

images/linux/scripts/helpers/install.sh

@@ -13,7 +13,7 @@ download_with_retries() {
     local NAME="${3:-${URL##*/}}"
     local COMPRESSED="$4"
 
-    if [ $COMPRESSED == "compressed" ]; then
+    if [[ $COMPRESSED == "compressed" ]]; then
         COMMAND="curl $URL -4 -sL --compressed -o '$DEST/$NAME'"
     else
         COMMAND="curl $URL -4 -sL -o '$DEST/$NAME'"

images/linux/scripts/installers/git.sh

@@ -3,9 +3,11 @@
 ##  File:  git.sh
 ##  Desc:  Installs Git
 ################################################################################
+set -e
 
 # Source the helpers for use with the script
-source $HELPER_SCRIPTS/document.sh
+source "$HELPER_SCRIPTS"/document.sh
+source "$HELPER_SCRIPTS"/install.sh
 
 ## Install git
 add-apt-repository ppa:git-core/ppa -y
@@ -46,7 +48,13 @@ DocumentInstalledItem "Git Large File Storage (LFS) ($(git-lfs --version 2>&1 |
 DocumentInstalledItem "Git-ftp ($(git-ftp --version | cut -d ' ' -f 3))"
 
 #Install hub
-snap install hub --classic
+tmp_hub="/tmp/hub"
+mkdir -p "$tmp_hub"
+url=$(curl -s https://api.github.com/repos/github/hub/releases/latest | jq -r '.assets[].browser_download_url | select(contains("hub-linux-amd64"))')
+download_with_retries "$url" "$tmp_hub"
+tar xzvf "$tmp_hub"/hub-linux-amd64-*.tgz --strip-components 1 -C "$tmp_hub"
+mv "$tmp_hub"/bin/hub /usr/local/bin
+
 if command -v hub; then
     echo "hub CLI was installed successfully"
     DocumentInstalledItem "Hub CLI ($(hub --version | grep "hub version" | cut -d ' ' -f 3))"

images/linux/scripts/installers/kubernetes-tools.sh

@@ -24,7 +24,9 @@ curl -LO https://storage.googleapis.com/minikube/releases/latest/minikube-linux-
 sudo install minikube-linux-amd64 /usr/local/bin/minikube
 
 # Install kustomize
-sudo snap install kustomize
+download_url="https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
+curl -s "$download_url" | bash
+mv kustomize /usr/local/bin
 
 # Run tests to determine that the software installed as expected
 echo "Testing to make sure that script performed as expected, and basic scenarios work"
@@ -58,4 +60,4 @@ DocumentInstalledItem "helm ($(helm version --short |& head -n 1))"
 # minikube version output already has word minikube in it. example minikube version: v1.9.2
 DocumentInstalledItem "$(minikube version --short)"
 # kustomize version output has "{} in it". example {kustomize/v3.8.1  2020-07-16T00:58:46Z  }
-DocumentInstalledItem "kustomize ($(kustomize version --short))"
+DocumentInstalledItem "kustomize ($(kustomize version --short))"

images/linux/scripts/installers/preparemetadata.sh

@@ -9,8 +9,8 @@ source $HELPER_SCRIPTS/document.sh
 
 WriteItem "<!--- DO NOT EDIT - This markdown file is autogenerated. -->"
 
-if [ $ANNOUNCEMENTS ]; then
-    WriteItem $ANNOUNCEMENTS
+if [ -n "$ANNOUNCEMENTS" ]; then
+    WriteItem "$ANNOUNCEMENTS"
     WriteItem "***"
 fi