From 2da9db26fb99124556e696cc55935366ffc837e2 Mon Sep 17 00:00:00 2001 From: Jon Mulder Date: Wed, 5 Jun 2024 15:57:03 -0400 Subject: [PATCH] chore: quiet curl output in build logs (#198) --- build-kmod-kvmfr.sh | 2 +- build-kmod-vhba.sh | 2 +- build-prep.sh | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build-kmod-kvmfr.sh b/build-kmod-kvmfr.sh index 0c65c809..ce15ba86 100755 --- a/build-kmod-kvmfr.sh +++ b/build-kmod-kvmfr.sh @@ -12,7 +12,7 @@ else COPR_RELEASE="${RELEASE}" fi -curl -Lo /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo "https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-${COPR_RELEASE}/hikariknight-looking-glass-kvmfr-fedora-${COPR_RELEASE}.repo" +curl -LsSf -o /etc/yum.repos.d/_copr_hikariknight-looking-glass-kvmfr.repo "https://copr.fedorainfracloud.org/coprs/hikariknight/looking-glass-kvmfr/repo/fedora-${COPR_RELEASE}/hikariknight-looking-glass-kvmfr-fedora-${COPR_RELEASE}.repo" ### BUILD kvmfr (succeed or fail-fast with debug output) rpm-ostree install \ diff --git a/build-kmod-vhba.sh b/build-kmod-vhba.sh index 42b0f351..65496988 100755 --- a/build-kmod-vhba.sh +++ b/build-kmod-vhba.sh @@ -18,7 +18,7 @@ else COPR_RELEASE="${RELEASE}" fi -curl -Lo /etc/yum.repos.d/_copr_rok-cdemu.repo "https://copr.fedorainfracloud.org/coprs/rok/cdemu/repo/fedora-${COPR_RELEASE}/rok-cdemu-fedora-${COPR_RELEASE}.repo" +curl -LsSf -o /etc/yum.repos.d/_copr_rok-cdemu.repo "https://copr.fedorainfracloud.org/coprs/rok/cdemu/repo/fedora-${COPR_RELEASE}/rok-cdemu-fedora-${COPR_RELEASE}.repo" ### BUILD vhba (succeed or fail-fast with debug output) rpm-ostree install \ diff --git a/build-prep.sh b/build-prep.sh index 5afcb3b4..4a6d9b0b 100755 --- a/build-prep.sh +++ b/build-prep.sh @@ -38,13 +38,13 @@ if [ -n "${RPMFUSION_MIRROR}" ]; then fi # required for main and surface when fedora repo has updated kernel beyond what was in the image -curl -L -o /etc/yum.repos.d/fedora-coreos-pool.repo \ +curl -LsSf -o /etc/yum.repos.d/fedora-coreos-pool.repo \ https://raw.githubusercontent.com/coreos/fedora-coreos-config/testing-devel/fedora-coreos-pool.repo ### PREPARE CUSTOM KERNEL SUPPORT if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then echo "Installing ASUS Kernel:" - curl -L -o /etc/yum.repos.d/_copr_lukenukem-asus-kernel.repo \ + curl -LsSf -o /etc/yum.repos.d/_copr_lukenukem-asus-kernel.repo \ https://copr.fedorainfracloud.org/coprs/lukenukem/asus-kernel/repo/fedora-$(rpm -E %fedora)/lukenukem-asus-kernel-fedora-$(rpm -E %fedora).repo rpm-ostree cliwrap install-to-root / rpm-ostree override replace \ @@ -59,7 +59,7 @@ if [[ "asus" == "${KERNEL_FLAVOR}" ]]; then kernel-modules-extra elif [[ "fsync-lts" == "${KERNEL_FLAVOR}" ]]; then echo "Installing fsync-lts kernel:" - curl -L -o /etc/yum.repos.d/_copr_sentry-kernel-ba.repo \ + curl -LsSf -o /etc/yum.repos.d/_copr_sentry-kernel-ba.repo \ https://copr.fedorainfracloud.org/coprs/sentry/kernel-ba/repo/fedora-$(rpm -E %fedora)/sentry-kernel-ba-fedora-$(rpm -E %fedora).repo rpm-ostree cliwrap install-to-root / rpm-ostree override replace \ @@ -74,7 +74,7 @@ elif [[ "fsync-lts" == "${KERNEL_FLAVOR}" ]]; then kernel-modules-extra elif [[ "fsync" == "${KERNEL_FLAVOR}" ]]; then echo "Installing fsync kernel:" - curl -L -o /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo \ + curl -LsSf -o /etc/yum.repos.d/_copr_sentry-kernel-fsync.repo \ https://copr.fedorainfracloud.org/coprs/sentry/kernel-fsync/repo/fedora-$(rpm -E %fedora)/sentry-kernel-fsync-fedora-$(rpm -E %fedora).repo rpm-ostree cliwrap install-to-root / rpm-ostree override replace \ @@ -90,9 +90,9 @@ elif [[ "fsync" == "${KERNEL_FLAVOR}" ]]; then elif [[ "surface" == "${KERNEL_FLAVOR}" ]]; then echo "Installing Surface Kernel:" # Add Linux Surface repo - curl -L -o /etc/yum.repos.d/linux-surface.repo \ + curl -LsSf -o /etc/yum.repos.d/linux-surface.repo \ https://pkg.surfacelinux.com/fedora/linux-surface.repo - curl -L -o /tmp/surface-kernel.rpm \ + curl -LsSf -o /tmp/surface-kernel.rpm \ https://github.com/linux-surface/linux-surface/releases/download/silverblue-20201215-1/kernel-20201215-1.x86_64.rpm rpm-ostree cliwrap install-to-root / rpm-ostree override replace /tmp/surface-kernel.rpm \