Final updates to installer

DiamondLightSource · Oct 26, 2017 · 3064e84 · 3064e84
1 parent 7938c05
commit 3064e84
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/install/2_1_install/savu_v2.1.1.tar.gz b/install/2_1_install/savu_v2.1.1.tar.gz
diff --git a/install/2_1_install/savu_v2.1.1/savu_installer.sh b/install/2_1_install/savu_v2.1.1/savu_installer.sh
@@ -239,12 +239,6 @@ if [ "$facility" ]; then
     cp $savu_path/mpi/$facility/savu_mpijob.sh $launcher_path
 fi
 
-
-echo "Installing tomopy..."
-# these packages were missing copied environment for some reason
-conda install -y -q -c dgursoy tomopy --no-deps
-conda install -y -q -c dgursoy dxchange --no-deps
-
 #-----------------------------------------------------------------
 echo "Installing pyfai..."
 pip install pyfai
@@ -298,6 +292,13 @@ echo "Installing xraylib..."
 conda install -y -q --use-local $xraylibbuild --no-deps
 #-----------------------------------------------------------------
 
+#-----------------------------------------------------------------
+echo "Installing tomopy..."
+# these packages were missing in copied environment
+conda install -y -q -c dgursoy tomopy --no-deps
+conda install -y -q -c dgursoy dxchange --no-deps
+#-----------------------------------------------------------------
+
 #-----------------------------------------------------------------
 #echo "Building xdesign"
 #conda build $recipes/xdesign