Merge pull request #1 from diedpigs/2.1-patch-1

2.1 patch 1

template/script.sh.erb

 #!/usr/bin/env bash
 module reset
 
-<%= context.custom_environment %>
-
 # load RStudio Server
 module load <%= context.rstudio_version %>
 
@@ -21,12 +19,19 @@ export RSESSION_WRAPPER_FILE="${PWD}/rsession.sh"
 (
 umask 077
 sed 's/^ \{2\}//' > "${RSESSION_WRAPPER_FILE}" << EOL
-  #!/usr/bin/env bash
+  #!/bin/bash -l
 
   # Log all output from this script
   export RSESSION_LOG_FILE="${PWD}/rsession.log"
   exec &>>"\${RSESSION_LOG_FILE}"
 
+  # load R
+  module load <%= context.r_version %>
+
+  <%= context.custom_environment %>
+
+  module list
+
   # Launch the original command
   echo "Launching rsession..."
   set -x