From c0c7e61cb5bbc03a4e5b3478d9c0ff8387d538e2 Mon Sep 17 00:00:00 2001
From: AJ ONeal <aj@therootcompany.com>
Date: Fri, 17 Nov 2023 08:57:24 -0700
Subject: [PATCH] fix: revert curl --fail-with-body to --fail

---
 _webi/curl-pipe-bootstrap.tpl.sh | 4 ++--
 _webi/install-package.tpl.ps1    | 2 +-
 ssh-authorize/ssh-authorize.ps1  | 2 +-
 webi/webi-pwsh.ps1               | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/_webi/curl-pipe-bootstrap.tpl.sh b/_webi/curl-pipe-bootstrap.tpl.sh
index 9cbac2e..73ec37e 100644
--- a/_webi/curl-pipe-bootstrap.tpl.sh
+++ b/_webi/curl-pipe-bootstrap.tpl.sh
@@ -119,9 +119,9 @@ fn_curl() { (
     a_url="${1}"
     a_path="${2}"
 
-    cmd_curl="curl --fail-with-body -sSL -#"
+    cmd_curl="curl -f -sSL -#"
     if fn_is_interactive; then
-        cmd_curl="curl --fail-with-body sSL"
+        cmd_curl="curl -f sSL"
     fi
 
     b_triple_ua="$(fn_get_target_triple_user_agent)"
diff --git a/_webi/install-package.tpl.ps1 b/_webi/install-package.tpl.ps1
index 77508e3..f833717 100644
--- a/_webi/install-package.tpl.ps1
+++ b/_webi/install-package.tpl.ps1
@@ -69,7 +69,7 @@ function Invoke-DownloadUrl {
         Write-Host "        ?$Params"
         $URL = "${URL}?${Params}"
     }
-    curl.exe '-#' --fail-with-body -sS -A $Env:WEBI_UA -L $URL | Out-File $TmpPath
+    curl.exe '-#' -f -sS -A $Env:WEBI_UA -L $URL | Out-File $TmpPath
 
     Remove-Item -Path $Path -Force -ErrorAction Ignore
     Move-Item $TmpPath $Path
diff --git a/ssh-authorize/ssh-authorize.ps1 b/ssh-authorize/ssh-authorize.ps1
index 7bf7dbf..b20b1b8 100644
--- a/ssh-authorize/ssh-authorize.ps1
+++ b/ssh-authorize/ssh-authorize.ps1
@@ -166,7 +166,7 @@ function Add-AuthorizedKey($UrlOrPath) {
 
     $TmpKeys = "new_authorized_keys.tmp.txt"
 
-    curl.exe --fail-with-body -sS $UrlOrPath | Out-File -Force "${TmpKeys}.partial"
+    curl.exe -f -sS $UrlOrPath | Out-File -Force "${TmpKeys}.partial"
     $null = Move-Item -Force "${TmpKeys}.partial" $TmpKeys
 
     IF ($IsHttp) {
diff --git a/webi/webi-pwsh.ps1 b/webi/webi-pwsh.ps1
index 54b402c..cfe534b 100755
--- a/webi/webi-pwsh.ps1
+++ b/webi/webi-pwsh.ps1
@@ -71,7 +71,7 @@ function Invoke-DownloadUrl {
         Write-Host "        ?$Params"
         $URL = "${URL}?${Params}"
     }
-    curl.exe '-#' --fail-with-body -sS -A $Env:WEBI_UA -L $URL | Out-File $TmpPath
+    curl.exe '-#' -f -sS -A $Env:WEBI_UA -L $URL | Out-File $TmpPath
 
     Remove-Item -Path $Path -Force -ErrorAction Ignore
     Move-Item $TmpPath $Path