From 15070594a5d7d7dee29388112625a49d6cf799ca Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Mon, 14 Oct 2019 19:42:32 +0200 Subject: [PATCH] TT#68300 Fix programs --help output We should only be printing relevant sections, not the entire man page, which is rather verbose, and provides information not appropriate for a --help output. We use verbose level 1, for the commands that just have SYNOPSIS and OPTIONS sections, and leave verbose level 99, but specify the relevant sections which are 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS'. Change-Id: I59d1999599d553c396e60e183592c00e93d1a1db --- bin/ngcp-api-ping | 2 +- bin/ngcp-create-customer | 1 + bin/ngcp-create-domain | 1 + bin/ngcp-create-subscriber | 1 + bin/ngcp-credit-warning | 2 +- bin/ngcp-delete-domain | 1 + bin/ngcp-fraud-notifier | 2 +- bin/ngcp-get-customer | 1 + bin/ngcp-sound-set | 1 + bin/ngcp-terminate-customer | 1 + bin/ngcp-terminate-subscriber | 1 + 11 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/ngcp-api-ping b/bin/ngcp-api-ping index 08fdb0d..52c7e30 100755 --- a/bin/ngcp-api-ping +++ b/bin/ngcp-api-ping @@ -30,7 +30,7 @@ sub check_params { sub usage { my $missing = shift; pod2usage(-exitval => $missing ? 1 : 0, - -verbose => 99, + -verbose => 1, -message => $missing ? "Missing parameters: $missing" : '', ); return; diff --git a/bin/ngcp-create-customer b/bin/ngcp-create-customer index b06c972..dac365b 100755 --- a/bin/ngcp-create-customer +++ b/bin/ngcp-create-customer @@ -36,6 +36,7 @@ sub usage { my $missing = shift; pod2usage(-exitval => $missing ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $missing ? "Missing parameters: $missing" : '', ); return; diff --git a/bin/ngcp-create-domain b/bin/ngcp-create-domain index 71fc9fa..5aa243b 100755 --- a/bin/ngcp-create-domain +++ b/bin/ngcp-create-domain @@ -44,6 +44,7 @@ sub usage { my $missing = shift; pod2usage(-exitval => $missing ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $missing ? "Missing parameters: $missing" : '', ); return; diff --git a/bin/ngcp-create-subscriber b/bin/ngcp-create-subscriber index 359f8db..87d8f80 100755 --- a/bin/ngcp-create-subscriber +++ b/bin/ngcp-create-subscriber @@ -41,6 +41,7 @@ sub usage { my $msg = shift; pod2usage(-exitval => $msg ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $msg ? $msg =~ /not found/i ? $msg diff --git a/bin/ngcp-credit-warning b/bin/ngcp-credit-warning index 804307c..72dff17 100755 --- a/bin/ngcp-credit-warning +++ b/bin/ngcp-credit-warning @@ -41,7 +41,7 @@ sub check_params { sub usage { my $msg = shift; pod2usage(-exitval => $msg ? 1 : 0, - -verbose => 99, + -verbose => 1, -message => $msg ? $msg =~ /not found/i ? $msg diff --git a/bin/ngcp-delete-domain b/bin/ngcp-delete-domain index 61ef76f..095c43a 100755 --- a/bin/ngcp-delete-domain +++ b/bin/ngcp-delete-domain @@ -37,6 +37,7 @@ sub usage { my $msg = shift; pod2usage(-exitval => $msg ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $msg ? $msg =~ /not found/i ? $msg diff --git a/bin/ngcp-fraud-notifier b/bin/ngcp-fraud-notifier index d0c455c..384f5ae 100755 --- a/bin/ngcp-fraud-notifier +++ b/bin/ngcp-fraud-notifier @@ -58,7 +58,7 @@ sub check_params { sub usage { my $msg = shift; pod2usage(-exitval => $msg ? 1 : 0, - -verbose => 99, + -verbose => 1, -message => $msg ? $msg =~ /not found/i ? $msg diff --git a/bin/ngcp-get-customer b/bin/ngcp-get-customer index f18c58c..f613217 100755 --- a/bin/ngcp-get-customer +++ b/bin/ngcp-get-customer @@ -32,6 +32,7 @@ sub usage { my $missing = shift; pod2usage(-exitval => $missing ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $missing ? "Missing parameters: $missing" : '', ); return; diff --git a/bin/ngcp-sound-set b/bin/ngcp-sound-set index 59fc58a..c0b6e89 100755 --- a/bin/ngcp-sound-set +++ b/bin/ngcp-sound-set @@ -32,6 +32,7 @@ sub usage { my $missing = shift; pod2usage(-exitval => $missing ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $missing ? "Missing parameters: $missing" : '', ); return; diff --git a/bin/ngcp-terminate-customer b/bin/ngcp-terminate-customer index e488d14..0da194e 100755 --- a/bin/ngcp-terminate-customer +++ b/bin/ngcp-terminate-customer @@ -32,6 +32,7 @@ sub usage { my $missing = shift; pod2usage(-exitval => $missing ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $missing ? "Missing parameters: $missing" : '', ); return; diff --git a/bin/ngcp-terminate-subscriber b/bin/ngcp-terminate-subscriber index 9893b07..4ca40d2 100755 --- a/bin/ngcp-terminate-subscriber +++ b/bin/ngcp-terminate-subscriber @@ -33,6 +33,7 @@ sub usage { my $msg = shift; pod2usage(-exitval => $msg ? 1 : 0, -verbose => 99, + -sections => 'SYNOPSIS|REQUIRED ARGUMENTS|OPTIONS', -message => $msg ? $msg =~ /not found/i ? $msg