From 0e3ef06a33c87a58019bf16b5757a5cac366ef7c Mon Sep 17 00:00:00 2001
From: Karen Arutyunov <karen@codesynthesis.com>
Date: Thu, 8 Aug 2019 16:24:35 +0300
Subject: Combine multiple single-character options into a single argument for
 testscript commands

---
 tests/machine/testscript | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/machine/testscript')

diff --git a/tests/machine/testscript b/tests/machine/testscript
index 16ab6b8..9265334 100644
--- a/tests/machine/testscript
+++ b/tests/machine/testscript
@@ -32,7 +32,7 @@ target = x86_64-unknown-unknown
 # Note: similar logic to what we have in Build OS.
 #
 +mkdir -p $tftp/toolchains/default/
-+curl -s -S -f -L $toolchain_url/toolchain.sha256 >=toolchain.sha256
++curl -sS --fail --location $toolchain_url/toolchain.sha256 >=toolchain.sha256
 
 +sed -n -e 's%^[0-9a-f]+ \*(.+)$%\1%p' toolchain.sha256 | set -e archives
 +sed -n -e 's%^(.+/)?build2-toolchain-([^.]+\.[^.]+\.[^-]+(-[ab]\.[^.+]+)?).*\.tar.*%\2%p' <"$archives" | set version
@@ -42,7 +42,7 @@ target = x86_64-unknown-unknown
 b=`basename \$i` ; \
 f=$tftp/toolchains/default/\$b; \
 echo \$b: 1>&2; \
-curl -# -f -L -z \$f -o \$f $toolchain_url/\$i; \
+curl -# --fail --location --time-cond \$f -o \$f $toolchain_url/\$i; \
 ln -sf \$b `sed -n -re 's/^\(.+\)-$version\(\\..+\)?\(\\.zip|\\.tar\\..+\|-.+)/\\1\\3/p' <<<\$f`; \
 done" <"$archives" 2>|
 
-- 
cgit v1.1