From f80882eba6e826e6a83e3e6da06ddb26f70da58c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Mon, 14 Apr 2014 21:03:46 +0200 Subject: [PATCH] mwjsduck-gen: Don't fail when running from different directory * Do not directly use $0 in help output, use basename instead * Do not use paths relative to the currect directory (Full disclosure: I can't write bash.) Change-Id: I4c73155cd691a2ddf134724e9df94e6594b78a02 --- maintenance/mwjsduck-gen | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/maintenance/mwjsduck-gen b/maintenance/mwjsduck-gen index 62d1bbab22..442163e316 100755 --- a/maintenance/mwjsduck-gen +++ b/maintenance/mwjsduck-gen @@ -6,21 +6,22 @@ then JSDUCK_MWVERSION="$2" elif [[ "$*" != "" ]] then - echo "Usage: $0 [--version ]" + FILENAME=$(basename $0) + echo "Usage: $FILENAME [--version ]" echo exit 1 fi +MWCORE_DIR=$(cd $(dirname $0)/..; pwd) + # Support jsduck 4.x and 5.x JSDUCK_VERSION="$(jsduck --version | sed -e 's/[.].*//')" if [ "$JSDUCK_VERSION" = "JSDuck 4" ]; then - JSDUCK_VERSION_OPT="--meta-tags ./maintenance/jsduck/MetaTags.rb --warnings=-no_doc" + JSDUCK_VERSION_OPT="--meta-tags $MWCORE_DIR/maintenance/jsduck/MetaTags.rb --warnings=-no_doc" else - JSDUCK_VERSION_OPT="--tags ./maintenance/jsduck/CustomTags.rb --warnings=-nodoc(class,public)" + JSDUCK_VERSION_OPT="--tags $MWCORE_DIR/maintenance/jsduck/CustomTags.rb --warnings=-nodoc(class,public)" fi -MWCORE_DIR=$(cd $(dirname $0)/..; pwd) - jsduck \ --config=$MWCORE_DIR/maintenance/jsduck/config.json \ $JSDUCK_VERSION_OPT \ -- 2.20.1