Skip to content

Commit 308b9ff

Browse files
author
Zachary Eisinger
committed
Prettier and update bash
1 parent a0982bf commit 308b9ff

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

externals/install-dotnet.sh

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ get_current_os_name() {
172172
return 0
173173
elif [ "$uname" = "FreeBSD" ]; then
174174
echo "freebsd"
175-
return 0
175+
return 0
176176
elif [ "$uname" = "Linux" ]; then
177177
local linux_platform_name
178178
linux_platform_name="$(get_linux_platform_name)" || { echo "linux" && return 0 ; }
@@ -728,11 +728,12 @@ downloadcurl() {
728728
# Append feed_credential as late as possible before calling curl to avoid logging feed_credential
729729
remote_path="${remote_path}${feed_credential}"
730730
731+
local curl_options="--retry 20 --retry-delay 2 --connect-timeout 15 -sSL -f --create-dirs "
731732
local failed=false
732733
if [ -z "$out_path" ]; then
733-
curl --retry 10 -sSL -f --create-dirs "$remote_path" || failed=true
734+
curl $curl_options "$remote_path" || failed=true
734735
else
735-
curl --retry 10 -sSL -f --create-dirs -o "$out_path" "$remote_path" || failed=true
736+
curl $curl_options -o "$out_path" "$remote_path" || failed=true
736737
fi
737738
if [ "$failed" = true ]; then
738739
say_verbose "Curl download failed"
@@ -748,12 +749,12 @@ downloadwget() {
748749
749750
# Append feed_credential as late as possible before calling wget to avoid logging feed_credential
750751
remote_path="${remote_path}${feed_credential}"
751-
752+
local wget_options="--tries 20 --waitretry 2 --connect-timeout 15 "
752753
local failed=false
753754
if [ -z "$out_path" ]; then
754-
wget -q --tries 10 -O - "$remote_path" || failed=true
755+
wget -q $wget_options -O - "$remote_path" || failed=true
755756
else
756-
wget --tries 10 -O "$out_path" "$remote_path" || failed=true
757+
wget $wget_options -O "$out_path" "$remote_path" || failed=true
757758
fi
758759
if [ "$failed" = true ]; then
759760
say_verbose "Wget download failed"

src/setup-dotnet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export async function run() {
3232
const dotnetInstaller = new installer.DotnetCoreInstaller(version);
3333
await dotnetInstaller.installDotnet();
3434
}
35-
35+
3636
const sourceUrl: string = core.getInput('source-url');
3737
const configFile: string = core.getInput('config-file');
3838
if (sourceUrl) {

0 commit comments

Comments
 (0)