Skip to content

Commit 02a4e55

Browse files
fixed conda EXE_GSAPATH handling
1 parent 082227f commit 02a4e55

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

Diff for: pangenes/_collinear_genes.pl

+6-4
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# Produces a TSV file with pairs of collinear genes in a format similar to
1515
# Ensembl Compara's, genomic coordinates are 1-based
1616

17-
# Copyright [2021-24]
17+
# Copyright [2021-25]
1818
# EMBL-European Bioinformatics Institute & Estacion Experimental de Aula Dei-CSIC
1919

2020
# Uses external software:
@@ -258,9 +258,11 @@ sub help_message {
258258
}
259259
} elsif($dogsalign) {
260260

261-
$GSAINDXEXE = "$gsalign_path/$GSAINDXEXE";
262-
$GSALIGNEXE = "$gsalign_path/$GSALIGNEXE";
263-
261+
if($gsalign_path ne '') {
262+
$GSAINDXEXE = "$gsalign_path/$GSAINDXEXE";
263+
$GSALIGNEXE = "$gsalign_path/$GSALIGNEXE";
264+
}
265+
264266
if(`$GSALIGNEXE 2>&1` !~ 'Usage') {
265267
print "# ERROR: cannot find binary file $GSALIGNEXE , exit\n";
266268
exit(-4)

Diff for: pangenes/lib/pangeneTools.pm

+1
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,7 @@ sub set_pangeneTools_env {
110110
$ENV{"EXE_GSALIGN"} = $ENV{'EXE_GSAPATH'}.'GSAlign';
111111
}
112112
if(!-e $ENV{'EXE_GSALIGN'}){
113+
$ENV{'EXE_GSAPATH'} = '';
113114
$ENV{'EXE_GSALIGN'} = 'GSAlign'; # should work if in conda PATH
114115
}
115116

0 commit comments

Comments
 (0)