← Commit list

ccf19d59e7

Viktor Szakats
Viktor Szakats
2026-06-25
SUCCESS Duration: 203s

Subject

scripts: use end-of-options marker in `cd`, `mkdir`, `mv`, `sha256sum` commands

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

.github/scripts/codespell.sh +1 -1.github/scripts/shellcheck.sh +1 -1.github/scripts/typos.sh +1 -1.github/scripts/yamlcheck.sh +1 -1appveyor.sh +2 -2scripts/cmakelint.sh +1 -1scripts/maketgz +4 -4scripts/perlcheck.sh +1 -1scripts/verify-release +3 -3tests/cmake/test.sh +5 -5tests/ech_tests.sh +1 -1
.github/scripts/codespell.sh+1 -1
@@ -5,7 +5,7 @@
set -eu
-cd "$(dirname "${0}")"/../..
+cd -- "$(dirname "${0}")"/../..
git ls-files -z | xargs -0 -r \
codespell \
.github/scripts/shellcheck.sh+1 -1
@@ -5,7 +5,7 @@
set -eu
-cd "$(dirname "${0}")"/../..
+cd -- "$(dirname "${0}")"/../..
git grep -z -l -E '^#!(/usr/bin/env bash|/bin/sh|/bin/bash)' | xargs -0 -r \
shellcheck --exclude=1091,2248 \
.github/scripts/typos.sh+1 -1
@@ -5,7 +5,7 @@
set -eu
-cd "$(dirname "${0}")"/../..
+cd -- "$(dirname "${0}")"/../..
git ls-files | typos \
--isolated \
.github/scripts/yamlcheck.sh+1 -1
@@ -5,7 +5,7 @@
set -eu
-cd "$(dirname "${0}")"/../..
+cd -- "$(dirname "${0}")"/../..
git ls-files '*.yaml' '*.yml' -z | xargs -0 -r \
yamllint \
appveyor.sh+2 -2
@@ -61,7 +61,7 @@ if [ -n "${CMAKE_GENERATOR:-}" ]; then
curl --disable --fail --silent --show-error --connect-timeout 15 --max-time 60 --retry 3 --retry-connrefused \
--location --proto-redir =https "https://github.com/Kitware/CMake/releases/download/v${CMAKE_VERSION}/${fn}.zip" --output pkg.bin
sha256sum pkg.bin && sha256sum pkg.bin | grep -qwF -- "${CMAKE_SHA256}" && 7z x -y pkg.bin >/dev/null && rm -f pkg.bin
- PATH="$PWD/${fn}/bin:$PATH"
+ PATH="$(pwd)/${fn}/bin:$PATH"
fi
# Set env CHKPREFILL to the value '_chkprefill' to compare feature detection
@@ -89,7 +89,7 @@ if [ -n "${CMAKE_GENERATOR:-}" ]; then
fi
echo 'curl_config.h'; grep -F '#define' _bld/lib/curl_config.h | sort || true
time cmake --build _bld --config "${PRJ_CFG}" --parallel 2
- [[ "${CMAKE_GENERATE:-}" != *'-DBUILD_SHARED_LIBS=OFF'* ]] && PATH="$PWD/_bld/lib/${PRJ_CFG}:$PATH"
+ [[ "${CMAKE_GENERATE:-}" != *'-DBUILD_SHARED_LIBS=OFF'* ]] && PATH="$(pwd)/_bld/lib/${PRJ_CFG}:$PATH"
[[ "${CMAKE_GENERATE:-}" = *'-DCURL_USE_OPENSSL=ON'* ]] && { PATH="${openssl_root}:$PATH"; cp "${openssl_root}"/*.dll "_bld/src/${PRJ_CFG}"; }
curl="_bld/src/${PRJ_CFG}/curl.exe"
else
scripts/cmakelint.sh+1 -1
@@ -41,7 +41,7 @@
set -eu
-cd "$(dirname "$0")"/..
+cd -- "$(dirname "$0")"/..
{
if [ -n "${1:-}" ]; then
scripts/maketgz+4 -4
@@ -180,7 +180,7 @@ fi
retar() {
tempdir=$1
- rm -rf "$tempdir"
+ rm -rf "${tempdir:?}"
mkdir "$tempdir"
cd "$tempdir"
gzip -dc "../$targz" | tar -xf -
@@ -188,7 +188,7 @@ retar() {
tar --create --format=ustar --owner=0 --group=0 --numeric-owner --sort=name curl-* | gzip --best --no-name > out.tar.gz
mv out.tar.gz ../
cd ..
- rm -rf "$tempdir"
+ rm -rf "${tempdir:?}"
}
retar ".tarbuild"
@@ -218,14 +218,14 @@ gzip -dc "$targz" | xz -6e - > "$xz"
# Now make a zip archive from the tar.gz original
#
makezip() {
- rm -rf "$tempdir"
+ rm -rf "${tempdir:?}"
mkdir "$tempdir"
cd "$tempdir"
gzip -dc "../$targz" | tar -xf -
find . | sort | zip -9 -X "$zip" -@ >/dev/null
mv "$zip" ../
cd ..
- rm -rf "$tempdir"
+ rm -rf "${tempdir:?}"
}
zip="curl-$version.zip"
scripts/perlcheck.sh+1 -1
@@ -30,7 +30,7 @@
set -eu
-cd "$(dirname "$0")"/..
+cd -- "$(dirname "$0")"/..
procs=6
command -v nproc >/dev/null && procs="$(nproc)"
scripts/verify-release+3 -3
@@ -63,7 +63,7 @@ mkdir -p _tarballs
rm -rf _tarballs/*
# checksum the original tarball to compare with later
-sha256sum "$tarball" >_tarballs/checksum
+sha256sum -- "$tarball" >_tarballs/checksum
# extract version number from file name
tarver=$(echo "$tarball" | sed 's/curl-\([0-9.]*\)\..*/\1/')
@@ -85,7 +85,7 @@ if test "$withgit" = 0; then
tar xf "$tarball"
# move away the original tarball
- mv "$tarball" "_tarballs/orig-$tarball"
+ mv -- "$tarball" "_tarballs/orig-$tarball"
pwd=$(pwd)
cd "curl-$curlver"
@@ -101,7 +101,7 @@ else
echo "*** Use git tag $tag"
# move away the original tarball
- mv "$tarball" "_tarballs/orig-$tarball"
+ mv -- "$tarball" "_tarballs/orig-$tarball"
prevtag=$(git symbolic-ref -q --short HEAD || git rev-parse HEAD)
git checkout -f "$tag"
tests/cmake/test.sh+5 -5
@@ -7,7 +7,7 @@
set -eu
-cd "$(dirname "$0")"
+cd -- "$(dirname "$0")"
mode="${1:-all}"; shift
@@ -31,7 +31,7 @@ runresults() {
if [ "${mode}" = 'all' ] || [ "${mode}" = 'ExternalProject' ]; then
(cd "${src}"; git archive --format=tar HEAD) | gzip > source.tar.gz
- src="${PWD}/source.tar.gz"
+ src="$(pwd)/source.tar.gz"
sha="$(sha256sum "${src}" | grep -a -i -o -w -E '[0-9a-f]{64}')"
bldc='bld-externalproject'
rm -rf "${bldc}"
@@ -43,7 +43,7 @@ if [ "${mode}" = 'all' ] || [ "${mode}" = 'ExternalProject' ]; then
fi
if [ "${mode}" = 'all' ] || [ "${mode}" = 'FetchContent' ]; then
- src="${PWD}/${src}"
+ src="$(pwd)/${src}"
bldc='bld-fetchcontent'
rm -rf "${bldc}"
"${cmake_consumer}" -B "${bldc}" -G "${gen}" ${cmake_opts} -DCMAKE_UNITY_BUILD=ON ${TEST_CMAKE_FLAGS:-} "$@" \
@@ -70,9 +70,9 @@ if [ "${mode}" = 'all' ] || [ "${mode}" = 'add_subdirectory' ]; then
fi
if [ "${mode}" = 'all' ] || [ "${mode}" = 'find_package' ]; then
- src="${PWD}/${src}"
+ src="$(pwd)/${src}"
bldp='bld-curl'
- prefix="${PWD}/${bldp}/_pkg"
+ prefix="$(pwd)/${bldp}/_pkg"
rm -rf "${bldp}"
"${cmake_provider}" -B "${bldp}" -S "${src}" -G "${gen}" ${cmake_opts} -DCMAKE_UNITY_BUILD=ON ${TEST_CMAKE_FLAGS:-} ${TEST_CMAKE_FLAGS_PROVIDER:-} "$@" \
-DBUILD_SHARED_LIBS=ON \
tests/ech_tests.sh+1 -1
@@ -211,7 +211,7 @@ have_portsblocked="no"
NOW=$(whenisitagain)
BINNAME=$(basename "$0" .sh)
if [ ! -d "$LTOP" ]; then
- mkdir -p "$LTOP"
+ mkdir -p -- "$LTOP"
fi
if [ ! -d "$LTOP" ]; then
echo "Cannot see $LTOP for logs - exiting"