From 5e6f3cec616823e52393bbd8a63738f309637734 Mon Sep 17 00:00:00 2001 From: David Flitney <dave.flitney@ndcn.ox.ac.uk> Date: Fri, 21 Apr 2006 13:39:29 +0000 Subject: [PATCH] Making the scripts more portable for FMRIB cayenne & jalapeno clusters --- bedpost | 10 +++++++++- bedpostX | 12 ++++++++++-- bedpostX_single_slice.sh | 1 - bedpost_single_slice.sh | 1 - 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/bedpost b/bedpost index af8fde3..6b02920 100755 --- a/bedpost +++ b/bedpost @@ -5,7 +5,15 @@ # SHCOPYRIGHT if [ "x$SGE_ROOT" = "x" ] ; then - . /usr/local/share/sge-6.0/default/common/settings.sh + if [ -f /usr/local/share/sge-6.0/default/common/settings.sh ] ; then + . /usr/local/share/sge-6.0/default/common/settings.sh + else if [ -f /usr/local/sge-6/default/common/settings.sh ] ; then + . /usr/local/sge-6/default/common/settings.sh + else + echo "bedpost: Couldn\'t locate SGE_ROOT\!" + exit 255 + fi + fi fi Usage() { diff --git a/bedpostX b/bedpostX index 5b138c4..24cbc51 100755 --- a/bedpostX +++ b/bedpostX @@ -5,12 +5,20 @@ # SHCOPYRIGHT if [ "x$SGE_ROOT" = "x" ] ; then - . /usr/local/share/sge-6.0/default/common/settings.sh + if [ -f /usr/local/share/sge-6.0/default/common/settings.sh ] ; then + . /usr/local/share/sge-6.0/default/common/settings.sh + else if [ -f /usr/local/sge-6/default/common/settings.sh ] ; then + . /usr/local/sge-6/default/common/settings.sh + else + echo "bedpost: Couldn\'t locate SGE_ROOT\!" + exit 255 + fi + fi fi Usage() { echo "" - echo "Usage: bedpost <subject directory> " + echo "Usage: bedpostX <subject directory> " echo "" echo "expects to find bvals and bvecs in subject directory" echo "expects to find data nodif_brain_mask nodif in subject directory" diff --git a/bedpostX_single_slice.sh b/bedpostX_single_slice.sh index 8080f60..6a87b26 100755 --- a/bedpostX_single_slice.sh +++ b/bedpostX_single_slice.sh @@ -7,7 +7,6 @@ slicezp=`${FSLDIR}/bin/zeropad $slice 4` #$ -cwd -q long.q #$ -S /bin/sh #$ -V -N bedpostX -#$ -l arch=tru64 #$ -m a ${FSLDIR}/bin/xfibres\ diff --git a/bedpost_single_slice.sh b/bedpost_single_slice.sh index 310575d..a9d27a1 100755 --- a/bedpost_single_slice.sh +++ b/bedpost_single_slice.sh @@ -7,7 +7,6 @@ slicezp=`${FSLDIR}/bin/zeropad $slice 4` #$ -cwd -q long.q #$ -S /bin/sh #$ -V -N bedpost -#$ -l arch=tru64 #$ -m a ${FSLDIR}/bin/diff_pvm\ -- GitLab