From 6af0536e5060c1baa4a4d91c3e2b11f806466063 Mon Sep 17 00:00:00 2001
From: Marty Kandes <mkandes@sdsc.edu>
Date: Tue, 20 Mar 2018 15:41:01 -0700
Subject: [PATCH] naked-singularity-v0.2.3 :: replaced expect-based install of
 miniconda2 and miniconda3 with batch, non-interactive installation process
 for ubuntu.def, ubuntu-cuda.def, ubuntu-openmpi.def, ubuntu-mvapich2.def,
 ubuntu-cuda-openmpi.def, theano-cpu.def, and theano-gpu.def on comet

---
 README                                        |  2 +-
 .../sdsc/comet/tensorflow/tensorflow-gpu.def  |  4 +-
 .../us/ucsd/sdsc/comet/theano/theano-cpu.def  | 29 +---------
 .../us/ucsd/sdsc/comet/theano/theano-gpu.def  | 29 +---------
 .../sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def | 56 +------------------
 .../us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def | 56 +------------------
 .../sdsc/comet/ubuntu/ubuntu-mvapich2.def     | 56 +------------------
 .../ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def | 56 +------------------
 .../us/ucsd/sdsc/comet/ubuntu/ubuntu.def      | 56 +------------------
 9 files changed, 22 insertions(+), 322 deletions(-)

diff --git a/README b/README
index fa46134..50485ee 100644
--- a/README
+++ b/README
@@ -29,7 +29,7 @@ AUTHOR
 
 VERSION
 
-    0.2.2
+    0.2.3
 
 LAST UPDATED
 
diff --git a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
index e022df6..e08d4b8 100644
--- a/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/tensorflow/tensorflow-gpu.def
@@ -256,7 +256,7 @@ OSVersion: xenial
     echo 'send "N\r"' >> install-tensorflow-python.exp
     echo 'expect "Do you wish to build TensorFlow with VERBS support? \[y/N\]: "' >> install-tensorflow-python.exp
     echo 'send "N\r"' >> install-tensorflow-python.exp
-    echo 'expect "Do you wish to build TensorFlow with OpenCL support? \[y/N\]: "' >> install-tensorflow-python.exp
+    echo 'expect "Do you wish to build TensorFlow with OpenCL SYCL support? \[y/N\]: "' >> install-tensorflow-python.exp
     echo 'send "N\r"' >> install-tensorflow-python.exp
     echo 'expect "Do you wish to build TensorFlow with CUDA support? \[y/N\]: "' >> install-tensorflow-python.exp
     echo 'send "Y\r"' >> install-tensorflow-python.exp
@@ -323,7 +323,7 @@ OSVersion: xenial
     echo 'send "N\r"' >> install-tensorflow-python3.exp
     echo 'expect "Do you wish to build TensorFlow with VERBS support? \[y/N\]: "' >> install-tensorflow-python3.exp
     echo 'send "N\r"' >> install-tensorflow-python3.exp
-    echo 'expect "Do you wish to build TensorFlow with OpenCL support? \[y/N\]: "' >> install-tensorflow-python3.exp
+    echo 'expect "Do you wish to build TensorFlow with OpenCL SYCL support? \[y/N\]: "' >> install-tensorflow-python3.exp
     echo 'send "N\r"' >> install-tensorflow-python3.exp
     echo 'expect "Do you wish to build TensorFlow with CUDA support? \[y/N\]: "' >> install-tensorflow-python3.exp
     echo 'send "Y\r"' >> install-tensorflow-python3.exp
diff --git a/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def b/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
index af12364..ff4faf3 100644
--- a/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/theano/theano-cpu.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180307
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,32 +73,7 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Set path to miniconda2 binary
     export PATH="/opt/miniconda2/bin:${PATH}"
diff --git a/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def b/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
index 9b54389..5fb7b3d 100644
--- a/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
+++ b/definition-files/us/ucsd/sdsc/comet/theano/theano-gpu.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180301
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,32 +73,7 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Set path to miniconda2 binary
     export PATH="/opt/miniconda2/bin:${PATH}"
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
index 02e967e..a27d634 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda-openmpi.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180316
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Location of NVIDIA repositories
     declare -r NVIDIA_ROOT_URL='http://developer.download.nvidia.com/compute'
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
index f513021..e907f3c 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-cuda.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Location of NVIDIA repositories
     declare -r NVIDIA_ROOT_URL='http://developer.download.nvidia.com/compute'
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
index 19abcf9..aaecc64 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-mvapich2.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Install basic drivers for user space access to Ethernet, RDMA,
     # and Infiniband. See https://community.mellanox.com/docs/DOC-2431
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
index b2d3764..17e9ab2 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu-openmpi.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,62 +73,12 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
 
     # Install basic drivers for user space access to Ethernet, RDMA,
     # and Infiniband. See https://community.mellanox.com/docs/DOC-2431
diff --git a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
index efbc3dc..e4ccc66 100644
--- a/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
+++ b/definition-files/us/ucsd/sdsc/comet/ubuntu/ubuntu.def
@@ -12,7 +12,7 @@ OSVersion: xenial
     SYSTEM_NAME comet
     SYSTEM_SINGULARITY_VERSION 2.3.2
     SYSTEM_URL http://www.sdsc.edu/support/user_guides/comet.html
-    LAST_UPDATED 20180302
+    LAST_UPDATED 20180320
 
 %setup
 
@@ -73,63 +73,13 @@ OSVersion: xenial
     # Install miniconda2
     wget https://repo.continuum.io/miniconda/Miniconda2-latest-Linux-x86_64.sh
     chmod +x Miniconda2-latest-Linux-x86_64.sh
-
-    echo '#!/usr/bin/expect -f' > install-miniconda2.exp
-    echo 'spawn ./Miniconda2-latest-Linux-x86_64.sh' >> install-miniconda2.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda2.exp
-    echo '>>> "' >> install-miniconda2.exp
-    echo 'send "\r   "' >> install-miniconda2.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "yes\r"' >> install-miniconda2.exp
-    echo 'expect "Miniconda2 will now be installed into this location:\r' >> install-miniconda2.exp
-    echo '/root/miniconda2\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda2.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda2.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda2.exp
-    echo '\r' >> install-miniconda2.exp
-    echo '\[/root/miniconda2\] >>> "' >> install-miniconda2.exp
-    echo 'send "/opt/miniconda2\r"' >> install-miniconda2.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda2 install location\r' >> install-miniconda2.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda2.exp
-    echo '\[no\] >>> "' >> install-miniconda2.exp
-    echo 'send "no\r"' >> install-miniconda2.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda2.exp
-
-    chmod +x install-miniconda2.exp
-    ./install-miniconda2.exp
+    ./Miniconda2-latest-Linux-x86_64.sh -b -p /opt/miniconda2
 
     # Install miniconda3
     wget https://repo.continuum.io/miniconda/Miniconda3-latest-Linux-x86_64.sh
     chmod +x Miniconda3-latest-Linux-x86_64.sh
+    ./Miniconda3-latest-Linux-x86_64.sh -b -p /opt/miniconda3
     
-    echo '#!/usr/bin/expect -f' > install-miniconda3.exp
-    echo 'spawn ./Miniconda3-latest-Linux-x86_64.sh' >> install-miniconda3.exp
-    echo 'expect "Please, press ENTER to continue\r' >> install-miniconda3.exp
-    echo '>>> "' >> install-miniconda3.exp
-    echo 'send "\r   "' >> install-miniconda3.exp
-    echo 'expect "Do you accept the license terms? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "yes\r"' >> install-miniconda3.exp
-    echo 'expect "Miniconda3 will now be installed into this location:\r' >> install-miniconda3.exp
-    echo '/root/miniconda3\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '  - Press ENTER to confirm the location\r' >> install-miniconda3.exp
-    echo '  - Press CTRL-C to abort the installation\r' >> install-miniconda3.exp
-    echo '  - Or specify a different location below\r' >> install-miniconda3.exp
-    echo '\r' >> install-miniconda3.exp
-    echo '\[/root/miniconda3\] >>> "' >> install-miniconda3.exp
-    echo 'send "/opt/miniconda3\r"' >> install-miniconda3.exp
-    echo 'expect "Do you wish the installer to prepend the Miniconda3 install location\r' >> install-miniconda3.exp
-    echo 'to PATH in your /root/.bashrc ? \[yes|no\]\r' >> install-miniconda3.exp
-    echo '\[no\] >>> "' >> install-miniconda3.exp
-    echo 'send "no\r"' >> install-miniconda3.exp
-    echo 'expect "Thank you for installing Miniconda2!\r"' >> install-miniconda3.exp
-
-    chmod +x install-miniconda3.exp
-    ./install-miniconda3.exp
-
     # Set container environment variables
     cd /.singularity.d/env
 
-- 
GitLab