From patchwork Thu Jan 28 13:27:26 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 8150411 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 8122A9F6DA for ; Thu, 28 Jan 2016 13:29:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B3AC220364 for ; Thu, 28 Jan 2016 13:29:08 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id D6F492034C for ; Thu, 28 Jan 2016 13:29:07 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 584BA6E89C; Thu, 28 Jan 2016 05:29:07 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id E1A6C6E89B for ; Thu, 28 Jan 2016 05:29:06 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 28 Jan 2016 05:29:06 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,358,1449561600"; d="scan'208";a="903004077" Received: from jnikula-mobl.fi.intel.com (HELO localhost) ([10.237.72.67]) by fmsmga002.fm.intel.com with ESMTP; 28 Jan 2016 05:29:03 -0800 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Thu, 28 Jan 2016 15:27:26 +0200 Message-Id: <0ca220b7c677abbe8200de5040c610a0ed71f556.1453985388.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [maintainer-tools PATCH v2 32/33] dim: show usage instead of the man page on unknown subcommands X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP I find displaying the man page on every typo a bit distracting. Now that we can list all the supported subcommands (by way of listing all the dim_ prefixed functions), add usage to show quick help. Also make it a subcommand of its own. Signed-off-by: Jani Nikula --- dim | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dim b/dim index 6f50f8b67184..1651b5e8218a 100755 --- a/dim +++ b/dim @@ -139,7 +139,7 @@ shift `expr $OPTIND - 1` # first positional argument is the subcommand if [ "$#" = "0" ]; then - subcommand="help" + subcommand="usage" else subcommand="$1" shift @@ -149,7 +149,7 @@ fi # Sanity checks. # -if [ "$subcommand" != "setup" -a "$subcommand" != "help" ]; then +if [ "$subcommand" != "setup" -a "$subcommand" != "help" -a "$subcommand" != "usage" ]; then for d in $DIM_PREFIX $DIM_PREFIX/$DIM_DRM_INTEL $DIM_PREFIX/drm-intel-rerere $DIM_PREFIX/drm-intel-nightly; do if [ ! -d $d ]; then echo "$d is missing, please check your configuration and/or run dim setup" @@ -1096,6 +1096,16 @@ function dim_help $renderer < $manpage | $pager } +function dim_usage +{ + echo "usage: $0 [OPTIONS] SUBCOMMAND [ARGUMENTS]" + echo + echo "The available subcommands are:" + declare -F | grep -o " dim_[a-zA-Z_]*" | sed 's/^ dim_/\t/' + echo + echo "See '$0 help' for more information." +} + # dim subcommand aliases declare -n subcmd=dim_alias_${subcommand//-/_} if [ -z "$subcmd" ]; then @@ -1107,5 +1117,6 @@ subcmd_func=dim_${subcmd//-/_} if declare -f $subcmd_func >/dev/null; then $subcmd_func "$@" else - dim_help + echo "$0: '$subcommand' is not a dim command." >&2 + dim_usage fi