Skip to content
Permalink
Browse files

merge master

  • Loading branch information...
kcranston committed Sep 18, 2019
2 parents 8f8ea58 + a591995 commit e9ff2998ec0d59490f7ee69f963e43cda310a23d
Showing with 2 additions and 3 deletions.
  1. +1 −2 Makefile
  2. +1 −1 bin/store-archive
@@ -83,7 +83,7 @@ r/ott-NEW/source/debug/transcript.out: bin/jython $(CLASS) \
bin/put ott-NEW draft $$((1 + `bin/get ott-NEW draft 0`))
@echo Writing transcript to r/ott-NEW/source/debug/transcript.out
rm -f /tmp/make-ott-completed
(time bin/jython make-ott.py ott-NEW 2>&1 \
(bin/jython make-ott.py ott-NEW 2>&1 \
&& touch /tmp/make-ott-completed) \
| tee r/ott-NEW/source/transcript.out.new
[ -e /tmp/make-ott-completed ]
@@ -104,7 +104,6 @@ r/ott-NEW/source/README.html: r/ott-NEW/source/debug/transcript.out util/make_re
python util/make_readme.py r/ott-NEW/source/ >$@

r/ott-NEW/source: r/ott-HEAD/resource/.made
bin/new-version ott .tgz cc0
bin/put ott-NEW minor $$((1 + `bin/get ott-HEAD minor`))
bin/put ott-NEW draft 0
bin/put ott-NEW ott_idspace ott
@@ -5,7 +5,7 @@
set -e

if [ x$SSH_PATH_PREFIX = x ]; then
SSH_PATH_PREFIX=files.opentreeoflife.org:/var/www/html/
SSH_PATH_PREFIX=files.opentreeoflife.org:/var/www/html
fi

host=`echo $SSH_PATH_PREFIX | sed -e s/:.*//`

0 comments on commit e9ff299

Please sign in to comment.
You can’t perform that action at this time.