From f17504050913bcd6de032f29452ce728b1cdfb15 Mon Sep 17 00:00:00 2001 From: tjc <tjc@ee4ac58c-ac51-4696-9907-e4b3aa274f04> Date: Fri, 16 May 2008 10:15:49 +0000 Subject: [PATCH] fix for macosx git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@7454 ee4ac58c-ac51-4696-9907-e4b3aa274f04 --- etc/run_fasta | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/etc/run_fasta b/etc/run_fasta index d9657d526..33ccfc483 100755 --- a/etc/run_fasta +++ b/etc/run_fasta @@ -6,7 +6,7 @@ # to customise this script see the function called run_one_prog below -RCS_HEADER="$Header: //tmp/pathsoft/artemis/etc/run_fasta,v 1.17 2007-04-16 15:35:45 tjc Exp $" +RCS_HEADER="$Header: //tmp/pathsoft/artemis/etc/run_fasta,v 1.18 2008-05-16 10:15:49 tjc Exp $" PROG=`echo $RCS_HEADER | sed 's/.*run_\(.*\),v.*/\1/'` @@ -30,22 +30,24 @@ fi # # Exchange DB name for fasta reference # -if [ "$DATABASE" = "%uniprot" ]; then - DATABASE="%U"; -elif [ "$DATABASE" = "%uniprot_archaea" ]; then - DATABASE="%A"; -elif [ "$DATABASE" = "%uniprot_bacteria" ]; then - DATABASE="%B"; -elif [ "$DATABASE" = "%uniprot_eukaryota" ]; then - DATABASE="%E"; -elif [ "$DATABASE" = "%uniprot_viruses" ]; then - DATABASE="%V"; -elif [ "$DATABASE" = "%uniprot_rest" ]; then - DATABASE="%R"; -elif [ "$DATABASE" = "%malaria" ]; then - DATABASE="%M"; -elif [ "$DATABASE" = "%kineto_aa" ]; then - DATABASE="%K"; +if [ -f "$FASTLIBS" ]; then + if [ "$DATABASE" = "%uniprot" ]; then + DATABASE="%U"; + elif [ "$DATABASE" = "%uniprot_archaea" ]; then + DATABASE="%A"; + elif [ "$DATABASE" = "%uniprot_bacteria" ]; then + DATABASE="%B"; + elif [ "$DATABASE" = "%uniprot_eukaryota" ]; then + DATABASE="%E"; + elif [ "$DATABASE" = "%uniprot_viruses" ]; then + DATABASE="%V"; + elif [ "$DATABASE" = "%uniprot_rest" ]; then + DATABASE="%R"; + elif [ "$DATABASE" = "%malaria" ]; then + DATABASE="%M"; + elif [ "$DATABASE" = "%kineto_aa" ]; then + DATABASE="%K"; + fi fi # expand any ~ or environment variables -- GitLab