When started without defining DPDK_CHECKPATCH_PATH, the usage was not
displayed.

Signed-off-by: Olivier Matz <olivier.matz at 6wind.com>
---
 scripts/checkpatches.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/checkpatches.sh b/scripts/checkpatches.sh
index afc611b..1e765e3 100755
--- a/scripts/checkpatches.sh
+++ b/scripts/checkpatches.sh
@@ -34,10 +34,6 @@
 # - DPDK_CHECKPATCH_PATH
 # - DPDK_CHECKPATCH_LINE_LENGTH
 . scripts/load-devel-config.sh
-if [ ! -x "$DPDK_CHECKPATCH_PATH" ] ; then
-       echo 'Cannot execute DPDK_CHECKPATCH_PATH' >&2
-       exit 1
-fi

 length=${DPDK_CHECKPATCH_LINE_LENGTH:-80}

@@ -51,7 +47,12 @@ 
SPLIT_STRING,LINE_SPACING,PARENTHESIS_ALIGNMENT,NETWORKING_BLOCK_COMMENT_STYLE,\
 NEW_TYPEDEFS,COMPARISON_TO_NULL"

 print_usage () {
-       echo "usage: $(basename $0) [-q] [-v] [patch1 [patch2] ...]]"
+       cat <<- END_OF_HELP
+       usage: $(basename $0) [-q] [-v] [patch1 [patch2] ...]]
+
+       Run Linux kernel checkpatch.pl with DPDK options.
+       The environment variable DPDK_CHECKPATCH_PATH must be set.
+       END_OF_HELP
 }

 quiet=false
@@ -66,6 +67,13 @@ while getopts hqv ARG ; do
 done
 shift $(($OPTIND - 1))

+if [ ! -x "$DPDK_CHECKPATCH_PATH" ] ; then
+       print_usage
+       echo
+       echo 'Cannot execute DPDK_CHECKPATCH_PATH' >&2
+       exit 1
+fi
+
 status=0
 for p in "$@" ; do
        ! $verbose || printf '\n### %s\n\n' "$p"
-- 
2.1.4

Reply via email to