Skip to content

Commit 85179e0

Browse files
committed
Allow JBrowse to run when picard not present
1 parent 4a5aa5b commit 85179e0

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

jbrowse/src/org/labkey/jbrowse/model/JsonFile.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.labkey.api.sequenceanalysis.SequenceOutputFile;
4343
import org.labkey.api.sequenceanalysis.pipeline.ReferenceGenome;
4444
import org.labkey.api.sequenceanalysis.pipeline.SequencePipelineService;
45+
import org.labkey.api.sequenceanalysis.run.PicardWrapper;
4546
import org.labkey.api.sequenceanalysis.run.SimpleScriptWrapper;
4647
import org.labkey.api.settings.AppProps;
4748
import org.labkey.api.util.FileType;
@@ -926,7 +927,10 @@ public File prepareResource(User u, Logger log, boolean throwIfNotPrepared, bool
926927
throw new IllegalStateException("This track should have been previously indexed: " + targetFile.getName());
927928
}
928929

929-
SequenceAnalysisService.get().ensureBamOrCramIdx(targetFile, log, false);
930+
if (PicardWrapper.getPicardJar(false) != null)
931+
{
932+
SequenceAnalysisService.get().ensureBamOrCramIdx(targetFile, log, false);
933+
}
930934
}
931935
}
932936

@@ -1131,11 +1135,6 @@ protected void createIndex(File finalLocation, Logger log, File idx, boolean thr
11311135
}
11321136
else
11331137
{
1134-
if (TRACK_TYPES.bam.getFileType().isType(finalLocation) || TRACK_TYPES.cram.getFileType().isType(finalLocation))
1135-
{
1136-
SequenceAnalysisService.get().ensureBamOrCramIdx(finalLocation, log, false);
1137-
}
1138-
11391138
if (SystemUtils.IS_OS_WINDOWS)
11401139
{
11411140
try

0 commit comments

Comments
 (0)