Merge branch 'master' into 'master'

request now uses exported PREFIX See merge request fsl/fslpy!44

Merge branch 'master' into 'master'
c0372b8d · Paul McCarthy · ee96ff3f · 8f11780d · c0372b8d · c0372b8d
Commit c0372b8d authored 7 years ago by Paul McCarthy
--- a/.conda/post-link.sh
+++ b/.conda/post-link.sh
-if [ -e ${FSLDIR}/bin/requestFSLpythonLink.sh ]; then 
+if [ -e ${FSLDIR}/etc/fslconf/requestFSLpythonLink.sh ]; then 
-    $FSLDIR/bin/requestFSLpythonLink.sh ${PREFIX}/bin atlasquery atlasq imcp immv imglob
+    $FSLDIR/etc/fslconf/requestFSLpythonLink.sh atlasquery atlasq imcp immv imglob
 fi
--- a/.conda/pre-unlink.sh
+++ b/.conda/pre-unlink.sh
-if [ -e ${FSLDIR}/bin/requestFSLpythonUnlink.sh ]; then 
+if [ -e ${FSLDIR}/etc/fslconf/requestFSLpythonUnlink.sh ]; then 
-    $FSLDIR/bin/requestFSLpythonUnlink.sh ${PREFIX}/bin atlasquery atlasq imcp immv imglob
+    $FSLDIR/etc/fslconf/requestFSLpythonUnlink.sh atlasquery atlasq imcp immv imglob
 fi