diff --git a/install/2_3_install/savu_v2.3.tar.gz b/install/2_3_install/savu_v2.3.tar.gz index 05dbc11ac..66288b4db 100644 Binary files a/install/2_3_install/savu_v2.3.tar.gz and b/install/2_3_install/savu_v2.3.tar.gz differ diff --git a/install/2_3_install/savu_v2.3/environment.yml b/install/2_3_install/savu_v2.3/environment.yml index f4a0a7503..095f74dcf 100644 --- a/install/2_3_install/savu_v2.3/environment.yml +++ b/install/2_3_install/savu_v2.3/environment.yml @@ -1,10 +1,13 @@ name: root channels: + - ccpi - tom.schoonjans - local - conda-forge - defaults dependencies: + - boost-cpp=1.64.0=1 + - ccpi-reconstruction=0.9=py27_0 - alabaster=0.7.10=py27_1 - asn1crypto=0.24.0=py27_0 - astroid=1.6.3=py27_0 @@ -17,6 +20,7 @@ dependencies: - backports_abc=0.5=py27_0 - beautifulsoup4=4.6.0=py27_0 - bleach=2.1.3=py_0 + - boost=1.64.0=py27_4 - bzip2=1.0.6=1 - ca-certificates=2018.4.16=0 - cairo=1.14.10=0 @@ -26,7 +30,7 @@ dependencies: - chardet=3.0.4=py27_0 - cloudpickle=0.5.3=py_0 - colorama=0.3.9=py27_0 - - conda=4.5.3=py27_0 + - conda=4.5.4=py27_0 - conda-build=3.10.2=py27_0 - conda-env=2.6.0=0 - conda-verify=2.0.0=py27_0 diff --git a/install/2_3_install/savu_v2.3/savu_installer.sh b/install/2_3_install/savu_v2.3/savu_installer.sh index 57fec4ceb..da4f5b2a0 100644 --- a/install/2_3_install/savu_v2.3/savu_installer.sh +++ b/install/2_3_install/savu_v2.3/savu_installer.sh @@ -254,8 +254,8 @@ if [ ! $test_flag ] ; then launcher_path=`command -v savu_launcher.sh` launcher_path=${launcher_path%/savu_launcher.sh} if [ "$facility" ]; then - cp $savu_path/mpi/$facility/savu_launcher.sh $launcher_path - cp $savu_path/mpi/$facility/savu_mpijob.sh $launcher_path + cp $savu_path/system_files/$facility/mpi/savu_launcher.sh $launcher_path + cp $savu_path/system_files/$facility/mpi/savu_mpijob.sh $launcher_path fi #-----------------------------------------------------------------