Merge pull request #393 from minrk/singleuser-start

singleuser-start adjustments

base-notebook/start-notebook.sh

@@ -4,4 +4,9 @@
 
 set -e
 
-. /usr/local/bin/start.sh jupyter notebook $*
+if [[ ! -z "${JUPYTERHUB_API_TOKEN}" ]]; then
+  # launched by JupyterHub, use single-user entrypoint
+  exec /usr/local/bin/start-singleuser.sh $*
+else
+  . /usr/local/bin/start.sh jupyter notebook $*
+fi

base-notebook/start-singleuser.sh

@@ -10,7 +10,7 @@ then
     notebook_arg="--notebook-dir=${NOTEBOOK_DIR}"
 fi
 
-exec jupyterhub-singleuser \
+. /usr/local/bin/start.sh jupyterhub-singleuser \
   --port=${JPY_PORT:-8888} \
   --ip=0.0.0.0 \
   --user=$JPY_USER \