diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /maintenance/mwjsduck-gen | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'maintenance/mwjsduck-gen')
| -rw-r--r-- | maintenance/mwjsduck-gen | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/maintenance/mwjsduck-gen b/maintenance/mwjsduck-gen index bc10bc2c..5247637b 100644 --- a/maintenance/mwjsduck-gen +++ b/maintenance/mwjsduck-gen @@ -1,4 +1,5 @@ #!/usr/bin/env bash +set -e JSDUCK_MWVERSION=master if [[ "$1" == "--version" && "$2" != "" ]] @@ -6,7 +7,8 @@ then JSDUCK_MWVERSION="$2" elif [[ "$*" != "" ]] then - echo "Usage $0: [--version <mediawiki version>]" + FILENAME=$(basename $0) + echo "Usage: $FILENAME [--version <mediawiki version>]" echo exit 1 fi @@ -15,7 +17,9 @@ MWCORE_DIR=$(cd $(dirname $0)/..; pwd) jsduck \ --config=$MWCORE_DIR/maintenance/jsduck/config.json \ ---footer="Documentation for MediaWiki core ($JSDUCK_MWVERSION). Generated on {DATE} by {JSDUCK} {VERSION}." \ -&& echo 'JSDuck execution finished.' +--footer="Documentation for branch ($JSDUCK_MWVERSION) on {DATE} by {JSDUCK} {VERSION}." \ +--processes 0 + +echo 'JSDuck execution finished.' ln -s ../../resources $MWCORE_DIR/docs/js/modules |