[test-port-forwarding.pl] fix: add human-readable error when nc is not installed on the host
#2764
+16
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Kanishk Pachauri <[email protected]>
Mr-Sunglasses
force-pushed
the
fix/#2707
branch
from
54e9272
to
6b1c7a0
Compare
jandubois
requested changes
Oct 19, 2024
| my $instance = shift; | ||
|
|
||
| # Check for netcat before proceeding | ||
| check_netcat_installed() unless -f $instance; |
There was a problem hiding this comment.
Why not move the check after the if (-f $instance) block below, so you don't need to repeat the check?
And given that the whole file is just one long script, I think the code should just be inlined and not put into a function.
Comment on lines
+28
to
+32
| die "Error: 'nc' (netcat) is not installed on the host system.\n" . | ||
| "Please install netcat to run this test script:\n" . | ||
| " - On macOS: brew install netcat\n" . | ||
| " - On Ubuntu/Debian: sudo apt-get install netcat\n" . | ||
| " - On RHEL/CentOS: sudo yum install nmap-ncat\n"; |
There was a problem hiding this comment.
It doesn't really matter, but instead of all the explicit newlines and concatenation you could use a here-document:
Suggested change
| die "Error: 'nc' (netcat) is not installed on the host system.\n" . | |
| "Please install netcat to run this test script:\n" . | |
| " - On macOS: brew install netcat\n" . | |
| " - On Ubuntu/Debian: sudo apt-get install netcat\n" . | |
| " - On RHEL/CentOS: sudo yum install nmap-ncat\n"; | |
| die <<"end_of_message"; | |
| Error: 'nc' (netcat) is not installed on the host system. | |
| Please install netcat to run this test script: | |
| - On macOS: brew install netcat | |
| - On Ubuntu/Debian: sudo apt-get install netcat | |
| - On RHEL/CentOS: sudo yum install nmap-ncat | |
| end_of_message |
AkihiroSuda
reviewed
Oct 19, 2024
| @@ -20,8 +20,24 @@ | |||
| use Socket qw(inet_ntoa); | |||
| use Sys::Hostname qw(hostname); | |||
|
|
|||
| # check for nc | |||
| sub check_netcat_installed { | |||
| my $nc_path = `which nc 2>/dev/null`; | |||
There was a problem hiding this comment.
which is often missing. command -v should work.
AkihiroSuda
changed the title
test-port-forwarding.pl] fix: add human-readable error when nc is not installed on the host
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
fix: #2707