1
0
mirror of https://github.com/libssh2/libssh2.git synced 2026-10-24 03:48:58 +03:00

scripts: minor fixes and improvements

- pass `--` before passing input files.
- scripts/maketgz: robustify `rm` invocations.
- prefer `$(pwd)` or `$PWD`.
- tests/cmake/test.sh: dump configs to CI log.
- tests/gen_keys.sh: fix to skip DSA if missing.
- replace openssl with `base` and `*sum` tools.
- tests/ossfuzz/ossfuzz.sh: fix to add a space before `-j`.

Closes #2265
This commit is contained in:
Viktor Szakats
2026-07-09 14:30:35 +02:00
parent 86dcc0ae40
commit f2ec1f2f34
7 changed files with 22 additions and 20 deletions

View File

@@ -21,7 +21,7 @@
set -eu
cd "$(dirname "$0")"/..
cd -- "$(dirname "$0")"/..
{
if [ -n "${1:-}" ]; then

View File

@@ -58,7 +58,7 @@ sed -i.bak \
-e "s/^#define LIBSSH2_VERSION_PATCH .*/#define LIBSSH2_VERSION_PATCH $patch/g" \
-e "s/^#define LIBSSH2_TIMESTAMP .*/#define LIBSSH2_TIMESTAMP \"$datestamp\"/g" \
"$HEADER"
rm -f "$HEADER.bak"
rm -f -- "$HEADER.bak"
if test -n "$only"; then
# done!
@@ -120,7 +120,7 @@ fi
retar() {
tempdir=$1
rm -rf "$tempdir"
rm -rf "${tempdir:?}"
mkdir "$tempdir"
cd "$tempdir"
gzip -dc "../$targz" | tar -xf -
@@ -128,7 +128,7 @@ retar() {
tar --create --format=ustar --owner=0 --group=0 --numeric-owner --sort=name libssh2-* | gzip --best --no-name > out.tar.gz
mv out.tar.gz ../
cd ..
rm -rf "$tempdir"
rm -rf "${tempdir:?}"
}
retar ".tarbuild"
@@ -158,14 +158,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="libssh2-$version.zip"

View File

@@ -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 \

View File

@@ -4,7 +4,7 @@
set -eu
cd "$(dirname "$0")"/..
cd -- "$(dirname "$0")"/..
git ls-files -z | xargs -0 -r \
codespell \