Commit 0d611406 authored by Paul McCarthy's avatar Paul McCarthy 🚵
Browse files

Merge branch 'master' into v1.6

parents 473f80d2 b4bb75d8
Pipeline #1602 passed with stages
in 7 minutes and 38 seconds
if [ -z ${FSLDIR} ]; then exit; fi
if [ ! -d ${FSLDIR}/bin ]; then exit; fi
scripts="atlasquery atlasq imcp immv imglob"
for script in $scripts; do
if [ -f ${FSLDIR}/bin/${script} ]; then rm ${FSLDIR}/bin/${script}; fi
ln -s ${PREFIX}/bin/${script} ${FSLDIR}/bin/${script}
done
if [ -z ${FSLDIR} ]; then exit; fi
scripts="atlasquery atlasq imcp immv imglob"
for script in $scripts; do
if [ -f ${FSLDIR}/bin/${script} ]; then rm ${FSLDIR}/bin/${script}; fi
done
......@@ -2,6 +2,15 @@ This document contains the ``fslpy`` release history in reverse chronological
order.
1.6.2 (Tuesday January 30th 2018)
---------------------------------
* Updates to the ``conda`` installation process.
* A new script is installed when ``fslpy`` is installed via ``pip`` or
``conda`` - ``atlasquery``, which emulates the FSL ``atlasquery`` tool.
1.6.1 (Monday January 29th 2018)
--------------------------------
......
......@@ -738,5 +738,16 @@ def main(args=None):
return 0
def atlasquery_emulation(args=None):
"""Entry point for ``atlasquery``. Runs as ``atlasq`` in ``ohi``
mode.
"""
if args is None:
args = sys.argv[1:]
return main(['ohi'] + args)
if __name__ == '__main__':
sys.exit(main())
......@@ -41,7 +41,7 @@ import re
import string
__version__ = '1.6.1'
__version__ = '1.6.2'
"""Current version number, as a string. """
......
......@@ -124,10 +124,11 @@ setup(
entry_points={
'console_scripts' : [
'immv = fsl.scripts.immv:main',
'imcp = fsl.scripts.imcp:main',
'imglob = fsl.scripts.imglob:main',
'atlasq = fsl.scripts.atlasq:main',
'immv = fsl.scripts.immv:main',
'imcp = fsl.scripts.imcp:main',
'imglob = fsl.scripts.imglob:main',
'atlasq = fsl.scripts.atlasq:main',
'atlasquery = fsl.scripts.atlasq:atlasquery_emulation',
]
}
)
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment