From 79758570798dd82ab60cdae3f4ae1fa3f48823a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 15 Jan 2021 13:02:44 +0100
Subject: [PATCH] tree-wide: use curl --fail

curl will save the 404 response page (or another error) if the page
download fails, which we never want. Let it error out instead.
---
 src/basic/linux/update.sh     |  4 ++--
 tools/autosuspend-update.sh   |  2 +-
 tools/hwdb-update.sh          | 14 +++++++-------
 tools/syscall-table-update.sh |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/basic/linux/update.sh b/src/basic/linux/update.sh
index 5595736f21f..dfc9871c532 100755
--- a/src/basic/linux/update.sh
+++ b/src/basic/linux/update.sh
@@ -4,9 +4,9 @@ set -eu
 
 for i in *.h */*.h; do
     if [[ $i == 'loadavg.h' ]]; then
-        curl https://raw.githubusercontent.com/torvalds/linux/master/include/linux/sched/$i -o $i
+        curl --fail https://raw.githubusercontent.com/torvalds/linux/master/include/linux/sched/$i -o $i
     else
-        curl https://raw.githubusercontent.com/torvalds/linux/master/include/uapi/linux/$i -o $i
+        curl --fail https://raw.githubusercontent.com/torvalds/linux/master/include/uapi/linux/$i -o $i
     fi
 
     sed -i -e 's/__user //g' -e '/^#include <linux\/compiler.h>/ d' $i
diff --git a/tools/autosuspend-update.sh b/tools/autosuspend-update.sh
index a4f99eb6b33..0e93eab720a 100755
--- a/tools/autosuspend-update.sh
+++ b/tools/autosuspend-update.sh
@@ -3,5 +3,5 @@ set -eu
 
 cd "$1"
 
-(curl -L 'https://chromium.googlesource.com/chromiumos/platform2/+/master/power_manager/udev/gen_autosuspend_rules.py?format=TEXT'; echo) \
+(curl --fail -L 'https://chromium.googlesource.com/chromiumos/platform2/+/master/power_manager/udev/gen_autosuspend_rules.py?format=TEXT'; echo) \
     | base64 -d > gen_autosuspend_rules.py
diff --git a/tools/hwdb-update.sh b/tools/hwdb-update.sh
index 39efd75192b..42251612dd7 100755
--- a/tools/hwdb-update.sh
+++ b/tools/hwdb-update.sh
@@ -15,13 +15,13 @@ if [ "${2:-}" != "-n" ]; then (
     [ -z "$permissive" ] || set +e
     set -x
 
-    curl -L -o usb.ids 'http://www.linux-usb.org/usb.ids'
-    curl -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids'
-    curl -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt'
-    curl -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt'
-    curl -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt'
-    curl -L -o pnp_id_registry.html 'https://uefi.org/uefi-pnp-export'
-    curl -L -o acpi_id_registry.html 'https://uefi.org/uefi-acpi-export'
+    curl --fail -L -o usb.ids 'http://www.linux-usb.org/usb.ids'
+    curl --fail -L -o pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids'
+    curl --fail -L -o ma-large.txt 'http://standards-oui.ieee.org/oui/oui.txt'
+    curl --fail -L -o ma-medium.txt 'http://standards-oui.ieee.org/oui28/mam.txt'
+    curl --fail -L -o ma-small.txt 'http://standards-oui.ieee.org/oui36/oui36.txt'
+    curl --fail -L -o pnp_id_registry.html 'https://uefi.org/uefi-pnp-export'
+    curl --fail -L -o acpi_id_registry.html 'https://uefi.org/uefi-acpi-export'
 ) fi
 
 set -x
diff --git a/tools/syscall-table-update.sh b/tools/syscall-table-update.sh
index 15b7792c53e..e2702462026 100755
--- a/tools/syscall-table-update.sh
+++ b/tools/syscall-table-update.sh
@@ -3,8 +3,8 @@ set -eu
 
 cd "$1" && shift
 
-curl -L -o syscall-names.text 'https://raw.githubusercontent.com/hrw/syscalls-table/master/syscall-names.text'
+curl --fail -L -o syscall-names.text 'https://raw.githubusercontent.com/hrw/syscalls-table/master/syscall-names.text'
 
 for arch in "$@"; do
-    curl -L -o syscalls-$arch "https://raw.githubusercontent.com/hrw/syscalls-table/master/tables/syscalls-$arch"
+    curl --fail -L -o syscalls-$arch "https://raw.githubusercontent.com/hrw/syscalls-table/master/tables/syscalls-$arch"
 done