From f125d5993558bf2c6ee4725be953f18539c75b96 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Mon, 29 Sep 2025 21:59:01 +1000 Subject: [PATCH] refactor: replace all wget commands with curl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Standardize download commands across all build scripts: - HashiCorp packages: wget -O → curl -o - VictoriaMetrics packages: wget -O → curl -o - Other packages: wget -O → curl -o, wget → curl -O - Update dependency lists to use curl instead of wget This change provides consistency across all packages and uses a single download tool. --- rpms/consul-cni/resources/build.sh | 2 +- rpms/consul/resources/build.sh | 2 +- rpms/incus/resources/build.sh | 6 +++--- rpms/nomad-autoscaler/resources/build.sh | 2 +- rpms/nomad/resources/build.sh | 2 +- rpms/nzbget/resources/build.sh | 2 +- rpms/packer/resources/build.sh | 2 +- rpms/terraform/resources/build.sh | 2 +- rpms/unrar/resources/build.sh | 2 +- rpms/vault/resources/build.sh | 2 +- rpms/victoria-logs/resources/build.sh | 2 +- rpms/vlutils/resources/build.sh | 2 +- rpms/vmagent/resources/build.sh | 2 +- rpms/vmalert/resources/build.sh | 2 +- rpms/vminsert/resources/build.sh | 2 +- rpms/vmselect/resources/build.sh | 2 +- rpms/vmstorage/resources/build.sh | 2 +- rpms/vmutils/resources/build.sh | 2 +- 18 files changed, 20 insertions(+), 20 deletions(-) diff --git a/rpms/consul-cni/resources/build.sh b/rpms/consul-cni/resources/build.sh index b38721c..bd9c870 100755 --- a/rpms/consul-cni/resources/build.sh +++ b/rpms/consul-cni/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract consul-cni -wget -O /app/consul-cni.zip https://releases.hashicorp.com/consul-cni/${PACKAGE_VERSION}/consul-cni_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/consul-cni.zip https://releases.hashicorp.com/consul-cni/${PACKAGE_VERSION}/consul-cni_${PACKAGE_VERSION}_linux_amd64.zip unzip consul-cni.zip # Build the RPM diff --git a/rpms/consul/resources/build.sh b/rpms/consul/resources/build.sh index 368177a..1e98c07 100755 --- a/rpms/consul/resources/build.sh +++ b/rpms/consul/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract consul -wget -O /app/consul.zip https://releases.hashicorp.com/consul/${PACKAGE_VERSION}/consul_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/consul.zip https://releases.hashicorp.com/consul/${PACKAGE_VERSION}/consul_${PACKAGE_VERSION}_linux_amd64.zip unzip consul.zip # Build the RPM diff --git a/rpms/incus/resources/build.sh b/rpms/incus/resources/build.sh index 7bc56d2..0d24a66 100755 --- a/rpms/incus/resources/build.sh +++ b/rpms/incus/resources/build.sh @@ -24,14 +24,14 @@ dnf install -y \ bash-completion \ gettext \ help2man \ - wget + curl # Download and extract incus source -wget -O /app/incus.tar.gz https://github.com/lxc/incus/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz +curl -o /app/incus.tar.gz https://github.com/lxc/incus/archive/refs/tags/v${PACKAGE_VERSION}.tar.gz tar -C /app -xf incus.tar.gz # Install specific Go version -wget https://go.dev/dl/go1.24.1.linux-amd64.tar.gz +curl -O https://go.dev/dl/go1.24.1.linux-amd64.tar.gz rm -rf /usr/local/go tar -C /usr/local -xzf go1.24.1.linux-amd64.tar.gz diff --git a/rpms/nomad-autoscaler/resources/build.sh b/rpms/nomad-autoscaler/resources/build.sh index b463ad9..31139d1 100755 --- a/rpms/nomad-autoscaler/resources/build.sh +++ b/rpms/nomad-autoscaler/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract nomad-autoscaler -wget -O /app/nomad-autoscaler.zip https://releases.hashicorp.com/nomad-autoscaler/${PACKAGE_VERSION}/nomad-autoscaler_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/nomad-autoscaler.zip https://releases.hashicorp.com/nomad-autoscaler/${PACKAGE_VERSION}/nomad-autoscaler_${PACKAGE_VERSION}_linux_amd64.zip unzip nomad-autoscaler.zip # Build the RPM diff --git a/rpms/nomad/resources/build.sh b/rpms/nomad/resources/build.sh index 834aaa5..f1ff62d 100755 --- a/rpms/nomad/resources/build.sh +++ b/rpms/nomad/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract nomad -wget -O /app/nomad.zip https://releases.hashicorp.com/nomad/${PACKAGE_VERSION}/nomad_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/nomad.zip https://releases.hashicorp.com/nomad/${PACKAGE_VERSION}/nomad_${PACKAGE_VERSION}_linux_amd64.zip unzip nomad.zip # Build the RPM diff --git a/rpms/nzbget/resources/build.sh b/rpms/nzbget/resources/build.sh index f70f602..d099963 100755 --- a/rpms/nzbget/resources/build.sh +++ b/rpms/nzbget/resources/build.sh @@ -1,5 +1,5 @@ #!/usr/bin/bash # Download the pre-built RPM from GitHub releases -wget -O /app/dist/nzbget-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \ +curl -o /app/dist/nzbget-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \ https://github.com/nzbgetcom/nzbget/releases/download/v$PACKAGE_VERSION/nzbget-${PACKAGE_VERSION}-${PACKAGE_RELEASE}.x86_64.rpm \ No newline at end of file diff --git a/rpms/packer/resources/build.sh b/rpms/packer/resources/build.sh index 6b0f15e..b87c4de 100755 --- a/rpms/packer/resources/build.sh +++ b/rpms/packer/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract packer -wget -O /app/packer.zip https://releases.hashicorp.com/packer/${PACKAGE_VERSION}/packer_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/packer.zip https://releases.hashicorp.com/packer/${PACKAGE_VERSION}/packer_${PACKAGE_VERSION}_linux_amd64.zip unzip packer.zip # Build the RPM diff --git a/rpms/terraform/resources/build.sh b/rpms/terraform/resources/build.sh index 3279615..4bfdbb2 100755 --- a/rpms/terraform/resources/build.sh +++ b/rpms/terraform/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract terraform -wget -O /app/terraform.zip https://releases.hashicorp.com/terraform/${PACKAGE_VERSION}/terraform_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/terraform.zip https://releases.hashicorp.com/terraform/${PACKAGE_VERSION}/terraform_${PACKAGE_VERSION}_linux_amd64.zip unzip terraform.zip # Build the RPM diff --git a/rpms/unrar/resources/build.sh b/rpms/unrar/resources/build.sh index cd9f95b..d8f2484 100755 --- a/rpms/unrar/resources/build.sh +++ b/rpms/unrar/resources/build.sh @@ -2,7 +2,7 @@ # Download and extract unrar (with version formatting) export DOWNLOAD_VERSION=$(echo $PACKAGE_VERSION | sed s/\\.//) -wget -O /app/rarlinux.tar.gz https://www.rarlab.com/rar/rarlinux-x64-${DOWNLOAD_VERSION}.tar.gz +curl -o /app/rarlinux.tar.gz https://www.rarlab.com/rar/rarlinux-x64-${DOWNLOAD_VERSION}.tar.gz tar xf /app/rarlinux.tar.gz mv /app/rar/unrar /app/ diff --git a/rpms/vault/resources/build.sh b/rpms/vault/resources/build.sh index 74abaa6..69d2a44 100755 --- a/rpms/vault/resources/build.sh +++ b/rpms/vault/resources/build.sh @@ -4,7 +4,7 @@ dnf install -y unzip # Download and extract vault -wget -O /app/vault.zip https://releases.hashicorp.com/vault/${PACKAGE_VERSION}/vault_${PACKAGE_VERSION}_linux_amd64.zip +curl -o /app/vault.zip https://releases.hashicorp.com/vault/${PACKAGE_VERSION}/vault_${PACKAGE_VERSION}_linux_amd64.zip unzip vault.zip # Build the RPM diff --git a/rpms/victoria-logs/resources/build.sh b/rpms/victoria-logs/resources/build.sh index c29b5d7..7f4a794 100755 --- a/rpms/victoria-logs/resources/build.sh +++ b/rpms/victoria-logs/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download and extract victoria-logs -wget -O /app/victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ +curl -o /app/victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ https://github.com/VictoriaMetrics/VictoriaLogs/releases/download/v${PACKAGE_VERSION}/victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf victoria-logs-linux-amd64-v${PACKAGE_VERSION}.tar.gz diff --git a/rpms/vlutils/resources/build.sh b/rpms/vlutils/resources/build.sh index 8331c45..a0d1945 100755 --- a/rpms/vlutils/resources/build.sh +++ b/rpms/vlutils/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download and extract vlutils -wget -O /app/vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ +curl -o /app/vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ https://github.com/VictoriaMetrics/VictoriaLogs/releases/download/v${PACKAGE_VERSION}/vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vlutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz diff --git a/rpms/vmagent/resources/build.sh b/rpms/vmagent/resources/build.sh index cce18fd..689d647 100755 --- a/rpms/vmagent/resources/build.sh +++ b/rpms/vmagent/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download the required files -wget -O /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz +curl -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/vmalert/resources/build.sh b/rpms/vmalert/resources/build.sh index cce18fd..689d647 100755 --- a/rpms/vmalert/resources/build.sh +++ b/rpms/vmalert/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download the required files -wget -O /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz +curl -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/vminsert/resources/build.sh b/rpms/vminsert/resources/build.sh index 1de62ab..8988c7a 100755 --- a/rpms/vminsert/resources/build.sh +++ b/rpms/vminsert/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download the required files -wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz +curl -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/vmselect/resources/build.sh b/rpms/vmselect/resources/build.sh index 1de62ab..8988c7a 100755 --- a/rpms/vmselect/resources/build.sh +++ b/rpms/vmselect/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download the required files -wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz +curl -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/vmstorage/resources/build.sh b/rpms/vmstorage/resources/build.sh index 1de62ab..8988c7a 100755 --- a/rpms/vmstorage/resources/build.sh +++ b/rpms/vmstorage/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download the required files -wget -O /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz +curl -o /app/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz tar xf victoria-metrics-linux-amd64-v${PACKAGE_VERSION}-cluster.tar.gz nfpm pkg --config /app/resources/nfpm.yaml --target /app/dist --packager rpm diff --git a/rpms/vmutils/resources/build.sh b/rpms/vmutils/resources/build.sh index 3ada06f..8cd37a2 100755 --- a/rpms/vmutils/resources/build.sh +++ b/rpms/vmutils/resources/build.sh @@ -1,7 +1,7 @@ #!/usr/bin/bash # Download and extract vmutils -wget -O /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ +curl -o /app/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz \ https://github.com/VictoriaMetrics/VictoriaMetrics/releases/download/v${PACKAGE_VERSION}/vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz tar xf vmutils-linux-amd64-v${PACKAGE_VERSION}.tar.gz