Merge branch 'paulmc-master-patch-55246' into 'master'

RF: Only pass <Command>_gui for GUI wrapper scripts

See merge request !12

meta.yaml

@@ -9,7 +9,7 @@
 {% set name       = 'fsl-fdt' %}
 {% set version    = '2103.0' %}
 {% set repository = 'https://git.fmrib.ox.ac.uk/fsl/fdt.git' %}
-{% set build      = '2' %}
+{% set build      = '3' %}
 
 package:
   name:    {{ name    }}
@@ -31,7 +31,7 @@ build:
 
 requirements:
   host:
-    - fsl-base >=2101.5
+    - fsl-base >=2108.2
     - fsl-armawrap >=0.4.3
     - fsl-avwutils >=2101.0
     - fsl-basisfield >=1910.0

post-link.sh

 if [ -e ${FSLDIR}/share/fsl/sbin/createFSLWrapper ]; then
-  ${FSLDIR}/share/fsl/sbin/createFSLWrapper \
-    eddy_correct zeropad maskdyads probtrack fdt_rotate_bvecs \
-    select_dwi_vols bedpost bedpostx bedpostx_postproc.sh \
-    bedpostx_preproc.sh bedpostx_single_slice.sh \
-    bedpostx_datacheck \
-    dtifit ccops medianfilter make_dyadic_vectors vecreg \
-    xfibres probtrackx pvmfit dtigen eddy_combine \
-    Fdt Fdt_gui \
-    correct_and_average ocmr_preproc \
-    reord_OM sausages replacevols fdt_matrix_ops indexer \
-    rearrange xfibres_pred
+  ${FSLDIR}/share/fsl/sbin/createFSLWrapper eddy_correct zeropad maskdyads probtrack fdt_rotate_bvecs select_dwi_vols bedpost bedpostx bedpostx_postproc.sh bedpostx_preproc.sh bedpostx_single_slice.sh bedpostx_datacheck dtifit ccops medianfilter make_dyadic_vectors vecreg xfibres probtrackx pvmfit dtigen eddy_combine correct_and_average ocmr_preproc reord_OM sausages replacevols fdt_matrix_ops indexer rearrange xfibres_pred Fdt_gui 
 
     # Update TCL library index for files newly added to $FSLDIR/tcl
     if [ ${FSLDIR} = ${PREFIX} ] && [ -e ${PREFIX}/bin/fsltclsh ]; then

pre-unlink.sh

 if [ -e ${FSLDIR}/share/fsl/sbin/removeFSLWrapper ]; then
-  ${FSLDIR}/share/fsl/sbin/removeFSLWrapper \
-    eddy_correct zeropad maskdyads probtrack fdt_rotate_bvecs \
-    select_dwi_vols bedpost bedpostx bedpostx_postproc.sh \
-    bedpostx_preproc.sh bedpostx_single_slice.sh \
-    bedpostx_datacheck \
-    dtifit ccops medianfilter make_dyadic_vectors vecreg \
-    xfibres probtrackx pvmfit dtigen eddy_combine \
-    Fdt Fdt_gui \
-    correct_and_average ocmr_preproc \
-    reord_OM sausages replacevols fdt_matrix_ops indexer \
-    rearrange xfibres_pred
+  ${FSLDIR}/share/fsl/sbin/removeFSLWrapper eddy_correct zeropad maskdyads probtrack fdt_rotate_bvecs select_dwi_vols bedpost bedpostx bedpostx_postproc.sh bedpostx_preproc.sh bedpostx_single_slice.sh bedpostx_datacheck dtifit ccops medianfilter make_dyadic_vectors vecreg xfibres probtrackx pvmfit dtigen eddy_combine correct_and_average ocmr_preproc reord_OM sausages replacevols fdt_matrix_ops indexer rearrange xfibres_pred Fdt_gui 
 fi