From: Daniel Stenberg <daniel@haxx.se>
Date: Fri, 2 Aug 2024 07:16:31 +0000 (+0200)
Subject: dmaketgz: only run 'make distclean' if Makefile exists
X-Git-Tag: curl-8_10_0~434
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d0afb339593085e83dbff60d13b818bd8c4cb5b5;p=thirdparty%2Fcurl.git

dmaketgz: only run 'make distclean' if Makefile exists

... so that we can avoid the build failure if we run this in a clean
checkout.

Also remove -it from the docker invoke since it is not interactive and
it needs no TTY. They made the job fail in the CI.
---

diff --git a/scripts/dmaketgz b/scripts/dmaketgz
index 25874793b3..88efb1c0f5 100755
--- a/scripts/dmaketgz
+++ b/scripts/dmaketgz
@@ -30,20 +30,22 @@ set -eu
 version="${1:-}"
 
 if [ -z "$version" ]; then
-  echo "Specify a version number!"
-  exit
+    echo "Specify a version number!"
+    exit
 fi
 
 timestamp="${2:-$(date -u +%s)}"
 
-make distclean
+if test -f Makefile; then
+    make distclean
+fi
 docker build \
        --build-arg SOURCE_DATE_EPOCH="$timestamp" \
        --build-arg UID="$(id -u)" \
        --build-arg GID="$(id -g)" \
        -t curl/curl .
 
-docker run --rm -it -u "$(id -u):$(id -g)" \
+docker run --rm -u "$(id -u):$(id -g)" \
        -v "$(pwd):/usr/src" -w /usr/src curl/curl sh -c "
   set -e
   autoreconf -fi