Skip to content

Commit 7ac221a

Browse files
authored
Add wget curl wrapper (#2772)
* Add wget curl wrapper * lint
1 parent 99f89b1 commit 7ac221a

File tree

3 files changed

+34
-3
lines changed

3 files changed

+34
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.idea/
2+
*.iml
23
.vscode/
34
workspace
45
**/.DS_Store

docker/buildDocker.sh

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,24 @@ JDK_VERSION=
1010
JDK_MAX=
1111
JDK_GA=
1212

13+
getFile() {
14+
if [ $# -ne 2 ]; then
15+
echo "getFile takes 2 arguments, $# argument(s) given"
16+
echo 'Usage: getFile https://example.com file_name'
17+
exit 1;
18+
elif command -v wget &> /dev/null; then
19+
wget -q "$1" -O "$2"
20+
elif command -v curl &> /dev/null; then
21+
curl -s "$1" -o "$2"
22+
else
23+
echo 'Please install wget or curl to continue'
24+
exit 1;
25+
fi
26+
}
27+
1328
# shellcheck disable=SC2002 # Disable UUOC error
1429
setJDKVars() {
15-
wget -q https://api.adoptium.net/v3/info/available_releases
30+
getFile https://api.adoptium.net/v3/info/available_releases available_releases
1631
JDK_MAX=$(awk -F: '/tip_version/{gsub("[, ]","",$2); print$2}' < available_releases)
1732
JDK_GA=$(awk -F: '/most_recent_feature_release/{gsub("[, ]","",$2); print$2}' < available_releases)
1833
rm available_releases
@@ -100,7 +115,7 @@ useEclipseOpenJ9DockerFiles()
100115

101116
mkdir -p "$dockerfileDir"
102117
cd "$dockerfileDir" || { echo "Dockerfile directory ($dockerfileDir) was not found"; exit 3; }
103-
wget https://raw.githubusercontent.com/eclipse-openj9/openj9/master/buildenv/docker/mkdocker.sh
118+
getFile https://raw.githubusercontent.com/eclipse-openj9/openj9/master/buildenv/docker/mkdocker.sh mkdocker.sh
104119
chmod +x mkdocker.sh
105120
# Generate an Ubuntu1804 Dockerfile using mkdocker.sh
106121
"$dockerfileDir/mkdocker.sh" --dist=ubuntu --version=18 --print >> "$dockerfileDir/Dockerfile"

docker/dockerfile-generator.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,24 @@ JDK_VERSION=8
1414
JDK_MAX=
1515
JDK_GA=
1616

17+
getFile() {
18+
if [ $# -ne 2 ]; then
19+
echo "getFile takes 2 arguments, $# argument(s) given"
20+
echo 'Usage: getFile https://example.com file_name'
21+
exit 1;
22+
elif command -v wget &> /dev/null; then
23+
wget -q "$1" -O "$2"
24+
elif command -v curl &> /dev/null; then
25+
curl -s "$1" -o "$2"
26+
else
27+
echo 'Please install wget or curl to continue'
28+
exit 1;
29+
fi
30+
}
31+
1732
# shellcheck disable=SC2002 # Disable UUOC error
1833
setJDKVars() {
19-
wget -q https://api.adoptium.net/v3/info/available_releases
34+
getFile https://api.adoptium.net/v3/info/available_releases available_releases
2035
JDK_MAX=$(cat available_releases \
2136
| grep 'tip_version' \
2237
| cut -d':' -f 2 \

0 commit comments

Comments
 (0)