2 files changed, 15 insertions, 11 deletions
diff --git a/bin/genenetwork2 b/bin/genenetwork2
index d7d1c325..52d3155c 100755
--- a/bin/genenetwork2
+++ b/bin/genenetwork2
@@ -26,6 +26,10 @@ GN2_BASE_DIR=$(dirname $(dirname "$SCRIPT"))
 
 echo GN2_BASE_DIR=$GN2_BASE_DIR
 
+GIT_HASH=$(git rev-parse HEAD)
+GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+export GN_VERSION=$(cat $GN2_BASE_DIR/VERSION)-$GIT_BRANCH-${GIT_HASH:0:9}
+echo GN_VERSION=$GN_VERSION
 
 # Handle settings parameter (can be .py or .json)
 settings=$1
@@ -79,13 +83,13 @@ fi
 # We may change this one:
 export PYTHONPATH=$GN2_BASE_DIR/wqflask:$PYTHONPATH
 
-# TEMPDIR defaults to /tmp if nothing else
-if [ -z $TEMPDIR ]; then
-    TEMPDIR="/tmp"
+# Our UNIX TMPDIR defaults to /tmp - change this on a shared server
+if [ -z $TMPDIR ]; then
+    TMPDIR="/tmp"
 fi
 
 set|grep $GN2_PROFILE
-set|grep TEMPDIR
+set|grep TMPDIR
 
 # Now handle command parameter -c
 if [ "$1" = '-c' ] ; then
@@ -98,7 +102,7 @@ if [ "$1" = '-c' ] ; then
 fi
 
 echo "Starting the redis server:"
-echo -n "dir $TEMPDIR
+echo -n "dir $TMPDIR
 dbfilename gn2.rdb
 " | redis-server - &
 
diff --git a/bin/test-website b/bin/test-website
index c9a72a5e..be223d94 100755
--- a/bin/test-website
+++ b/bin/test-website
@@ -52,12 +52,12 @@ opts = OptionParser.new do |o|
     options[:link_checker] = true
   end
 
-  o.on('--navigation-test', 'Check for navigation') do
-    options[:navigation_test] = true
+  o.on('--navigation', 'Check for navigation') do
+    options[:navigation] = true
   end
 
-  o.on('--mapping-test', 'Check for mapping') do
-    options[:mapping_test] = true
+  o.on('--mapping', 'Check for mapping') do
+    options[:mapping] = true
   end
 
   o.on('--skip-broken', 'Skip tests that are known to be broken') do
@@ -98,7 +98,7 @@ $: << File.join(libpath,'test/lib')
 
 require 'main_web_functionality'
 
-if options[:all] or options[:mapping_test]
+if options[:all] or options[:mapping]
   require 'mapping'
 end
 
@@ -106,6 +106,6 @@ if options[:all] or options[:link_checker]
   require 'link_checker'
 end
 
-if options[:all] or options[:navigation_test]
+if options[:all] or options[:navigation]
   require 'navigation'
 end