Skip to content

Commit

Permalink
Improvements and updates to cwl-runner implementation.
Browse files Browse the repository at this point in the history
 - Update cwl-runner for changing command name from cwl_run to run.
 - Handle (in at least a minimal fashion) all arguments required to be used by conformance test code.
  • Loading branch information
jmchilton committed May 1, 2016
1 parent e6f88a6 commit c24e088
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 2 deletions.
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ clean-test: ## remove test and coverage artifacts
rm -f .coverage
rm -fr htmlcov/

install:
python setup.py install && cd cwl-runner && python setup.py install

setup-venv: ## setup a development virutalenv in current directory
if [ ! -d $(VENV) ]; then virtualenv $(VENV); exit; fi;
$(IN_VENV) pip install -r requirements.txt && pip install -r dev-requirements.txt
Expand Down
43 changes: 41 additions & 2 deletions cwl-runner/cwl-runner
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
#!/bin/sh
#!/bin/bash

planemo cwl_run "$@"
PLANEMO_BIN="${PLANEMO_BIN:-planemo}"
PLANEMO_ARGS="${PLANEMO_ARGS:-}"

VERBOSE_ARG="--verbose"
USE_CONTAINER=0

# Pop args meant for common_startup.sh
while :
do
case "$1" in
--version|--help)
$PLANEMO_BIN "$1"
exit $?
;;
--no-container)
USE_CONTAINER=1
shift
;;
--quiet)
VERBOSE_ARG=""
shift
;;
--basedir*)
BASEDIR=`echo $1 | sed -e 's/^[^=]*=//g'`
#echo `pwd`
#cd "$BASEDIR"
shift
;;
"")
break
;;
*)
PLANEMO_ARGS="$PLANEMO_ARGS $1"
shift
;;
esac
done

# TODO: Do something with USE_CONTAINER
$PLANEMO_BIN $VERBOSE_ARG run $PLANEMO_ARGS

0 comments on commit c24e088

Please sign in to comment.