Skip to content

Commit 2c5930d

Browse files
committed
generate_tarball.sh: check for zstd and use ZSTD_CMD variable
1 parent 3bb5b70 commit 2c5930d

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

ciq/SOURCES/generate_tarball.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ fi
4848

4949
set -e
5050

51+
ZSTD_CMD=$(which zstd 2>/dev/null) || { echo "Error: zstd not found. Install it with: dnf install zstd"; exit 1; }
52+
5153
TARBALL="$SOURCE_DIR/linux-$TARFILE_RELEASE.tar.zst"
5254
ZSTD_THREADS="--threads=4"
5355
ARCH=$(arch)
@@ -62,7 +64,7 @@ fi
6264
_GITID="$(git rev-parse HEAD)"
6365

6466
if [ -f "$TARBALL" ]; then
65-
TARID=$(zstdcat -qq "$TARBALL" | git get-tar-commit-id 2>/dev/null)
67+
TARID=$("$ZSTD_CMD" -d -c -qq "$TARBALL" | git get-tar-commit-id 2>/dev/null)
6668
if [ "$_GITID" = "$TARID" ]; then
6769
echo "$(basename "$TARBALL") unchanged..."
6870
exit 0
@@ -72,6 +74,6 @@ fi
7274

7375
echo "Creating $(basename "$TARBALL")..."
7476
trap '[ $? -ne 0 ] && rm -vf "$TARBALL"' EXIT
75-
git archive --prefix="linux-$TARFILE_RELEASE"/ --format=tar "$_GITID" | zstd $ZSTD_OPTIONS $ZSTD_THREADS > "$TARBALL";
77+
git archive --prefix="linux-$TARFILE_RELEASE"/ --format=tar "$_GITID" | "$ZSTD_CMD" $ZSTD_OPTIONS $ZSTD_THREADS > "$TARBALL";
7678

7779
echo "Tarball created: $TARBALL"

0 commit comments

Comments
 (0)