From 7ac221a3f9692af2f20865e2c86481af98dcecb1 Mon Sep 17 00:00:00 2001
From: David Dadon <david@dadon.fr>
Date: Wed, 3 Nov 2021 11:13:50 +0100
Subject: [PATCH] Add wget curl wrapper (#2772)

* Add wget curl wrapper

* lint
---
 .gitignore                     |  1 +
 docker/buildDocker.sh          | 19 +++++++++++++++++--
 docker/dockerfile-generator.sh | 17 ++++++++++++++++-
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index d872a4b16..c0e76c051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 .idea/
+*.iml
 .vscode/
 workspace
 **/.DS_Store
diff --git a/docker/buildDocker.sh b/docker/buildDocker.sh
index 588d5067a..61ce2bba3 100755
--- a/docker/buildDocker.sh
+++ b/docker/buildDocker.sh
@@ -10,9 +10,24 @@ JDK_VERSION=
 JDK_MAX=
 JDK_GA=
 
+getFile() {
+  if [ $# -ne 2 ]; then
+    echo "getFile takes 2 arguments, $# argument(s) given"
+    echo 'Usage: getFile https://example.com file_name'
+    exit 1;
+  elif command -v wget &> /dev/null; then
+    wget -q "$1" -O "$2"
+  elif command -v curl &> /dev/null; then
+    curl -s "$1" -o "$2"
+  else
+    echo 'Please install wget or curl to continue'
+    exit 1;
+  fi
+}
+
 # shellcheck disable=SC2002 # Disable UUOC error
 setJDKVars() {
-    wget -q https://api.adoptium.net/v3/info/available_releases
+    getFile https://api.adoptium.net/v3/info/available_releases available_releases
     JDK_MAX=$(awk -F: '/tip_version/{gsub("[, ]","",$2); print$2}' < available_releases)
     JDK_GA=$(awk -F: '/most_recent_feature_release/{gsub("[, ]","",$2); print$2}' < available_releases)
     rm available_releases
@@ -100,7 +115,7 @@ useEclipseOpenJ9DockerFiles()
 
     mkdir -p "$dockerfileDir"
     cd "$dockerfileDir" || { echo "Dockerfile directory ($dockerfileDir) was not found"; exit 3; }
-    wget https://raw.githubusercontent.com/eclipse-openj9/openj9/master/buildenv/docker/mkdocker.sh
+    getFile https://raw.githubusercontent.com/eclipse-openj9/openj9/master/buildenv/docker/mkdocker.sh mkdocker.sh
     chmod +x mkdocker.sh
     # Generate an Ubuntu1804 Dockerfile using mkdocker.sh
     "$dockerfileDir/mkdocker.sh" --dist=ubuntu --version=18 --print >> "$dockerfileDir/Dockerfile"
diff --git a/docker/dockerfile-generator.sh b/docker/dockerfile-generator.sh
index a07b8e63a..baf907c83 100755
--- a/docker/dockerfile-generator.sh
+++ b/docker/dockerfile-generator.sh
@@ -14,9 +14,24 @@ JDK_VERSION=8
 JDK_MAX=
 JDK_GA=
 
+getFile() {
+  if [ $# -ne 2 ]; then
+    echo "getFile takes 2 arguments, $# argument(s) given"
+    echo 'Usage: getFile https://example.com file_name'
+    exit 1;
+  elif command -v wget &> /dev/null; then
+    wget -q "$1" -O "$2"
+  elif command -v curl &> /dev/null; then
+    curl -s "$1" -o "$2"
+  else
+    echo 'Please install wget or curl to continue'
+    exit 1;
+  fi
+}
+
 # shellcheck disable=SC2002 # Disable UUOC error
 setJDKVars() {
-  wget -q https://api.adoptium.net/v3/info/available_releases
+  getFile https://api.adoptium.net/v3/info/available_releases available_releases
   JDK_MAX=$(cat available_releases \
       | grep 'tip_version' \
       | cut -d':' -f 2 \