Merge pull request #55 from jonathan-major/master

SDK-162: added RAPTURE_HOME var.

Author: Jonathan Major

Setup/rapture.bat

@@ -1,15 +1,16 @@
-@echo off 
+@echo off
 ECHO ***************************************************************
 ECHO Starting Rapture Demo Client Environment Setup
 SET "REFLEX_RUNNER_LATEST=https://github.com/RapturePlatform/Rapture/releases/latest"
 SET "REFLEX_RUNNER_DOWNLOAD_PREFIX=https://github.com/RapturePlatform/Rapture/releases/download"
 SET "RAPTURE_SETUP_DIR=%CD%"
+SET "RAPTURE_HOME=%CD%\.."
 
 REM "*************************************************************"
 REM get etienne credentials to setup env info
 SET "etienneurl=developer.incapture.net"
-SET /P user=Enter Etienne User: 
-SET /P pass=Enter Etienne Password: 
+SET /P user=Enter Incapture User:
+SET /P pass=Enter Incapture Password:
 
 REM "*************************************************************"
 REM create a hashed password usin md5.exe
@@ -23,7 +24,7 @@ SET "LOGIN_URL=http://%etienneurl%:8080/login/login?user=%user%^&password=%hashp
 SET "SERVICE_URL=http://%etienneurl%:8080/curtisscript/getEnvInfo?username=%user%"
 
 REM "*************************************************************"
-REM call login url to get cookie and then get the enn details 
+REM call login url to get cookie and then get the enn details
 %CD%\tools\curl --silent --cookie-jar cookiefile.txt %LOGIN_URL% > nul 2>&1
 %CD%\tools\curl --silent --cookie cookiefile.txt %SERVICE_URL% > tmpenvinfo.txt
 

Setup/rapture.sh

@@ -3,6 +3,9 @@ HOST="http://developer.incapture.net:8080"
 REFLEX_RUNNER_LATEST_HOST="https://github.com"
 REFLEX_RUNNER_LATEST="$REFLEX_RUNNER_LATEST_HOST/RapturePlatform/Rapture/releases/latest"
 
+# write the export statements to a file to be sourced later
+env_var_filename=".rapture_client.$RANDOM.env"
+
 cur_dir=$(pwd)
 pattern="(.*RaptureTutorials).*"
 if [[ $cur_dir =~ $pattern ]]; then
@@ -111,8 +114,7 @@ if [ -z "$reflex_runner_path" ]; then
   fi
 fi
 
-# write the export statements to a file to be sourced later
-env_var_filename=".rapture_client.$RANDOM.env"
+
 
 if [ -n "$reflex_runner_path" ] && [ !$reflex_runner_is_in_path ] ; then
   add_to_path=$(dirname $reflex_runner_path)
@@ -157,7 +159,7 @@ do
 done
 
 echo "export RAPTURE_TUTORIAL_CSV=$csv_path" >> $env_var_filename
-
+echo "export RAPTURE_HOME=$rapture_tutorials_dir" >> $env_var_filename
 
 
 # Also write a welcome banner to the file and change the prompt so it's easier for the user
@@ -183,4 +185,3 @@ screen -h 2000 -S Rapture sh -c "exec /bin/bash -init-file ./$env_var_filename"
 
 # will execute after screen session exits
 rm $env_var_filename
-