git-market/curl-curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-04-11 12:01:42 +08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

genserv.pl: detect openssl in PATH, omit command -v

Browse Source 
Before this patch the script relied on Perl `system()` finding `openssl`
in `PATH`, plus tried to display the full path of `openssl` by using
`command -v` (or `which` on Windows). `command -v` did not work in CI
for unknown reasons. To resolve it, this patch detects `openssl` in
`PATH` manually, displays the detected full path and calls `openssl`
with the detected full path, and stops relying on `system` for this.

It also follows how `sshhelp.pm` is detecting executables. Though this
patch uses Perl `-f` instead of `-e && -d` used there .

Silencing this in CI logs:
```
Can't exec "command": No such file or directory at ../../../tests/certs/genserv.pl line 51.
```
Ref: https://github.com/curl/curl/actions/runs/14145795884/job/39632942668?pr=16865#step:39:108

Closes #16868
This commit is contained in:
Viktor Szakats 2025-03-29 14:43:10 +01:00
parent 8579cf4016
commit 3e2860f66d
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/certs/genserv.pl
View File

@ -27,6 +27,7 @@ use strict;
use warnings;
use File::Basename;
use File::Spec;
my $OPENSSL = 'openssl';
if(-f '/usr/local/ssl/bin/openssl') {
@ -48,7 +49,18 @@ if(!$CAPREFIX) {
} elsif(! -f "$CAPREFIX-ca.cacert" ||
! -f "$CAPREFIX-ca.key") {
system($^O eq 'MSWin32' ? 'which' : 'command -v' ." $OPENSSL");
if($OPENSSL eq basename($OPENSSL)) { # has no dir component
# find openssl in PATH
foreach(File::Spec->path()) {
my $file = File::Spec->catfile($_, $OPENSSL);
if(-f $file) {
$OPENSSL = $file;
last;
}
}
}
print "$OPENSSL\n";
system("$OPENSSL version");
$PREFIX = $CAPREFIX;