Merge branch 'mnt/conda' into 'master'

Mnt/conda

See merge request !2

Makefile

@@ -2,6 +2,6 @@ include ${FSLCONFDIR}/default.mk
 
 PROJNAME = misc_scripts
 
-SCRIPTS = fslecho regscript remove_vols replace_and_average_fmrib linkbedpost ocmr_preproc correct_and_average eddy_correct Text2Vest Vest2Text AnatomicalAverage fsl_abspath fsl_anat fslFixText
+SCRIPTS = fslecho AnatomicalAverage fsl_anat fslFixText
 
 all:

Text2Vest

-#!/bin/sh
-#   Copyright (C) 2012 University of Oxford
-#
-#   SHCOPYRIGHT
-if [ $# -lt 2 ] ; then 
-  echo "`basename $0` <text file> <vest file>"
-  exit 0
-fi
-
-NumPoints=`grep -cve '^\s*$' $1`
-NumWaves=`wc $1 | awk '{ print $2 }'`
-NumWaves=`expr $NumWaves / $NumPoints`
-
-echo /NumWaves $NumWaves    > $2
-echo /NumPoints $NumPoints >> $2
-echo /Matrix               >> $2
-
-cat $1 >> $2
-

Vest2Text

-#!/bin/sh
-#   Copyright (C) 2012 University of Oxford
-#
-#   SHCOPYRIGHT
-if [ $# -lt 2 ] ; then 
-  echo "`basename $0` <vest file> <text file>"
-  exit 0
-fi
-sed -e "/\//d" $1 | sed '/^$/d' > $2
-

fsl_abspath

-#!/usr/bin/env fslpython
-#   fsl_abspath - return true file path
-#   Matthew Webster FMRIB Image Analysis Group
-#   Copyright (C) 2009 University of Oxford 
-#   SHBASECOPYRIGHT
-from __future__ import print_function
-import sys
-import os
-
-print (os.path.realpath(sys.argv[1]))
-sys.exit(0)