allow for notebook (#123)

Author: johrstrom

template/before.sh.erb

@@ -43,15 +43,7 @@ if [[ ${WORKSPACE_FILE+x} ]]; then
   cp $WORKSPACE_FILE .
 fi
 
-<%-
-api = if context.auto_modules_app_jupyter.split('/')[1].to_s > '4.0' || context.mode == "1"
-        'lab'
-      else
-        'tree'
-      end
--%>
-
-JUPYTER_API="<%= api %>"
+JUPYTER_API="<%= context.mode == "1" ? 'lab' : 'tree' %>"
 
 export JUPYTERLAB_WORKSPACES_DIR=$PWD
 export jupyter_api="$JUPYTER_API"

template/script.sh.erb

@@ -1,13 +1,4 @@
 #!/usr/bin/env bash
-<%-
-  require 'pathname'
-
-  subcommand =  if context.auto_modules_app_jupyter.split('/')[1].to_s > '4.0' || context.mode == "1"
-                  'lab'
-                else
-                  'notebook'
-                end
--%>
 
 echo "Starting main script..."
 echo "TTT - $(date)"
@@ -44,4 +35,4 @@ echo "TTT - $(date)"
 
 # Launch the Jupyter server
 set -x
-jupyter <%= subcommand %> --config="${CONFIG_FILE}"
+jupyter <%= context.mode == "1" ? 'lab' : 'notebook' %> --config="${CONFIG_FILE}"