From df7cdf077f323b4e86a3945360cc8e1c1d42b486 Mon Sep 17 00:00:00 2001
From: tmp64 <tmp32x2@gmail.com>
Date: Sat, 2 Dec 2023 11:36:10 +0000
Subject: [PATCH] Linux: Rename curl in Dockerfiles

---
 ...erfile.bhl-build-libcurl => Dockerfile.bhl-build-curl} | 8 ++++----
 containers/linux/{build-libcurl.sh => build-curl.sh}      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)
 rename containers/linux/{Dockerfile.bhl-build-libcurl => Dockerfile.bhl-build-curl} (84%)
 rename containers/linux/{build-libcurl.sh => build-curl.sh} (92%)
 mode change 100755 => 100644

diff --git a/containers/linux/Dockerfile.bhl-build-libcurl b/containers/linux/Dockerfile.bhl-build-curl
similarity index 84%
rename from containers/linux/Dockerfile.bhl-build-libcurl
rename to containers/linux/Dockerfile.bhl-build-curl
index a2e7e90..9ab3663 100644
--- a/containers/linux/Dockerfile.bhl-build-libcurl
+++ b/containers/linux/Dockerfile.bhl-build-curl
@@ -1,13 +1,13 @@
 FROM bhl-build
 
 ENV BUILD_DATE="2023-11-26.1"
-ENV LIBZIP_VERSION="8.4.0"
+ENV CURL_VERSION="8.4.0"
 
 # Download and extract
-WORKDIR /build/libzip
+WORKDIR /build/curl
 
 RUN curl -f -L \
-    https://curl.se/download/curl-${LIBZIP_VERSION}.tar.xz \
+    https://curl.se/download/curl-${CURL_VERSION}.tar.xz \
     -o libcurl.tar.xz
 
 RUN tar -xvf libcurl.tar.xz
@@ -17,7 +17,7 @@ COPY out/zlib/. ${BHL_PREFIX_PATH}
 COPY out/mbedtls/. ${BHL_PREFIX_PATH}
 
 # Build
-WORKDIR curl-${LIBZIP_VERSION}/_build
+WORKDIR curl-${CURL_VERSION}/_build
 RUN cmake .. \
     -GNinja \
     -DCMAKE_TOOLCHAIN_FILE=${BHL_TOOLCHAIN} \
diff --git a/containers/linux/build-libcurl.sh b/containers/linux/build-curl.sh
old mode 100755
new mode 100644
similarity index 92%
rename from containers/linux/build-libcurl.sh
rename to containers/linux/build-curl.sh
index de4eb8c..f3abece
--- a/containers/linux/build-libcurl.sh
+++ b/containers/linux/build-curl.sh
@@ -2,10 +2,10 @@
 
 set -e
 
-IMAGE_TAG="bhl-build-libcurl"
+IMAGE_TAG="bhl-build-curl"
 TEMP_CONT="${IMAGE_TAG}-temp"
 DOCKERFILE="Dockerfile.$IMAGE_TAG"
-OUT_DIR="out/libcurl"
+OUT_DIR="out/curl"
 
 mkdir -p $OUT_DIR