From c87e77e54684c20c533b5a92bf995410efc3f249 Mon Sep 17 00:00:00 2001
From: Mehdi Rahim <rahim.mehdi@gmail.com>
Date: Sat, 22 Apr 2017 20:31:00 +0200
Subject: [PATCH 1/3] spm12 integration

---
 circle.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/circle.yml b/circle.yml
index bd1e5470..85044654 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,11 +1,11 @@
 machine:
   environment:
-    SPM_DIR: /home/ubuntu/opt/spm8/spm8_mcr/spm8
-    SPM_MCR: /home/ubuntu/opt/spm8/spm8.sh
+    SPM_DIR: /home/ubuntu/opt/spm12/spm12_mcr/spm12
+    SPM_MCR: /home/ubuntu/opt/spm12/spm12.sh
 
 dependencies:
   cache_directories:
-    - "~/opt/spm8"
+    - "~/opt/spm12"
     - "~/nilearn_data"
 
   pre:
@@ -13,7 +13,7 @@ dependencies:
     - sudo apt-get update
     - sudo apt-get install libxp6 libxpm4 libxmu6 libxt6 bc
     # Installing SPM
-    - source continuous_integration/setup_spm.sh
+    - source continuous_integration/setup_spm12.sh
     # Installing Pypreprocess dependencies
     - pip install --upgrade pip
     - |

From 74992aee14ca5a2c12aeb3262eeee111cf3e772f Mon Sep 17 00:00:00 2001
From: Mehdi Rahim <rahim.mehdi@gmail.com>
Date: Sat, 22 Apr 2017 20:33:52 +0200
Subject: [PATCH 2/3] spm12 integration

---
 circle.yml                          | 2 +-
 continuous_integration/setup_spm.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/circle.yml b/circle.yml
index 85044654..d6cf2890 100644
--- a/circle.yml
+++ b/circle.yml
@@ -13,7 +13,7 @@ dependencies:
     - sudo apt-get update
     - sudo apt-get install libxp6 libxpm4 libxmu6 libxt6 bc
     # Installing SPM
-    - source continuous_integration/setup_spm12.sh
+    - source continuous_integration/setup_spm.sh
     # Installing Pypreprocess dependencies
     - pip install --upgrade pip
     - |
diff --git a/continuous_integration/setup_spm.sh b/continuous_integration/setup_spm.sh
index 46acbb9a..a69d88ba 100644
--- a/continuous_integration/setup_spm.sh
+++ b/continuous_integration/setup_spm.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-SPM_INSTALL_SCRIPT=continuous_integration/install_spm.sh
+SPM_INSTALL_SCRIPT=continuous_integration/install_spm12.sh
 echo ""
 echo "SPM_INSTALL_SCRIPT: $SPM_INSTALL_SCRIPT"
 sudo bash $SPM_INSTALL_SCRIPT

From ffab51b089501cde0f3f54f7d1ca56f818068cf4 Mon Sep 17 00:00:00 2001
From: Mehdi Rahim <rahim.mehdi@gmail.com>
Date: Sat, 22 Apr 2017 20:38:03 +0200
Subject: [PATCH 3/3] spm12 integration

---
 continuous_integration/install_spm12.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/continuous_integration/install_spm12.sh b/continuous_integration/install_spm12.sh
index e9dc5436..1c1a99e5 100644
--- a/continuous_integration/install_spm12.sh
+++ b/continuous_integration/install_spm12.sh
@@ -5,13 +5,13 @@ set -e
 
 SPM_ROOT_DIR=~/opt/spm12   #  Installation directory
 
-SPM_SRC=spm12_r6685.zip
+SPM_SRC=spm12_r6914.zip
 MCRINST=MCRInstaller.bin
 
 mkdir -p $SPM_ROOT_DIR && cd $SPM_ROOT_DIR
 
 if [ ! -d spm12 ]; then
-    if [ ! -f ${SPM_SRC} ]; then 
+    if [ ! -f ${SPM_SRC} ]; then
 	wget http://www.fil.ion.ucl.ac.uk/spm/download/restricted/utopia/${SPM_SRC}
     fi
     unzip -q ${SPM_SRC}
@@ -44,4 +44,3 @@ ${cmds}
 echo "You may want to add the following commands (the exports) to your ~/.bashrc file once and for all."
 echo
 echo ${cmds}
-