Merge pull request #1 from jmchilton/master

Small tweaks
nsoranzo · Nov 1, 2015 · b428f78 · b428f78
2 parents aecbcdc + b76839c
commit b428f78
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -1,3 +1,3 @@
 To install [BioBlend](http://bioblend.readthedocs.org) in a virtualenv and start the [IPython notebook](http://ipython.org/notebook.html), run `start_tutorial.sh` .
 
-Accompanying Slides [https://docs.google.com/presentation/d/12wts6oaUH4TLKYMYBzCZPYI3Jf1wzl1ecK0IeCVkJ4s/pub?start=false&loop=false&delayms=3000](https://docs.google.com/presentation/d/12wts6oaUH4TLKYMYBzCZPYI3Jf1wzl1ecK0IeCVkJ4s/pub?start=false&loop=false&delayms=3000).
+[Accompanying slides](https://docs.google.com/presentation/d/12wts6oaUH4TLKYMYBzCZPYI3Jf1wzl1ecK0IeCVkJ4s/pub?start=false&loop=false&delayms=3000).
diff --git a/start_tutorial.sh b/start_tutorial.sh
@@ -1,10 +1,16 @@
 #!/bin/sh
 
+# Stop on problems.
+set -e
+
 cd `dirname $0`
 
-test -z "$VIRTUAL_ENV" || deactivate
+# Target git master using BIOBLEND_TARGET=git+git://github.com/galaxyproject/bioblend.git@master start_tutorial.sh
+BIOBLEND_TARGET="${BIOBLEND_TARGET:-bioblend}"
+
+test -z "$VIRTUAL_ENV" || deactivate || true
 virtualenv .venv && . .venv/bin/activate
 python -c 'import sys; sys.version_info >= (2, 7, 9) or sys.exit(1)' || pip install --upgrade --force-reinstall requests[security]
-pip install --upgrade bioblend
+pip install --upgrade "$BIOBLEND_TARGET"
 pip install ipython[all]
 ipython notebook