cache apt in circle.yml, fix data download commands

Author: oesteban

circle.yml

@@ -6,27 +6,22 @@ dependencies:
   cache_directories:
     - "~/docker"
     - "~/examples"
+    - "~/.apt-cache"
 
   pre:
     - mkdir -p "~/scratch/nose"
     # Let CircleCI cache the apt archive
     - sudo rm -rf /var/cache/apt/archives && sudo ln -s ~/.apt-cache /var/cache/apt/archives && mkdir -p ~/.apt-cache/partial
+    - sudo apt-get -y update && sudo apt-get install -y wget bzip2
 
   override:
-    - sudo apt-get -y update && sudo apt-get install -y wget bzip2
     - if [[ -e ~/docker/image.tar ]]; then docker load -i ~/docker/image.tar; fi
     - docker build -f docker/nipype_test_py27/Dockerfile -t nipype/nipype_test:py27 . :
         timeout: 1600
     - mkdir -p ~/docker; docker save nipype/nipype_test:py27 > ~/docker/image.tar :
         timeout: 1600
-    - if [[ ! -d ~/examples/data ]]; then \
-      wget -O nipype-tutorial.tar.bz2 https://googledrive.com/host/0BxI12kyv2olZR05SU1lPampNcVE && \
-      tar jxvf nipype-tutorial.tar.bz2 && \
-      mv nipype-tutorial/* ~/examples/; fi
-    - if [[ ! -d ~/examples/feeds ]]; then \
-      wget -O fsl-feeds.tar.gz https://googledrive.com/host/0BxI12kyv2olZNXBONlJKV0Y1Tm8 && \
-      tar xzf fsl-feeds.tar.gz && \
-      mv feeds ~/examples/; fi
+    - if [[ ! -d ~/examples/data ]]; then wget -O nipype-tutorial.tar.bz2 https://googledrive.com/host/0BxI12kyv2olZR05SU1lPampNcVE && tar jxvf nipype-tutorial.tar.bz2 && mv nipype-tutorial/* ~/examples/; fi
+    - if [[ ! -d ~/examples/feeds ]]; then wget -O fsl-feeds.tar.gz https://googledrive.com/host/0BxI12kyv2olZNXBONlJKV0Y1Tm8 && tar xzf fsl-feeds.tar.gz && mv feeds ~/examples/; fi
 
 test:
   override: