From f35e0f6824b84a5bd64e7e5d9e670386755cd891 Mon Sep 17 00:00:00 2001
From: Jeremy Nicklas <jnicklas@osc.edu>
Date: Mon, 16 Oct 2017 15:40:18 -0400
Subject: [PATCH] reduce conflicts with purge instead of restore
---
README.md | 2 +-
template/script.sh.erb | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 66ca8be..c1eb7f1 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ OnDemand node):
that allow users to define custom environment-based kernels from within the
Jupyter notebook dashboard.
- [Lmod](https://www.tacc.utexas.edu/research-development/tacc-projects/lmod)
- 6.0.1+ or any other `module restore` and `module load <modules>` based CLI
+ 6.0.1+ or any other `module purge` and `module load <modules>` based CLI
used to load appropriate environments within the batch job before launching
the Jupyter Notebook server.
diff --git a/template/script.sh.erb b/template/script.sh.erb
index c5d51a6..f0d5eb4 100755
--- a/template/script.sh.erb
+++ b/template/script.sh.erb
@@ -8,8 +8,8 @@ cd "${HOME}"
#
<%- unless context.modules.blank? -%>
-# Restore the module environment to avoid conflicts
-module restore
+# Purge the module environment to avoid conflicts
+module purge
# Load the require modules
module load <%= context.modules %>
--
GitLab