Skip to content

Commit 0bac05d

Browse files
committed
1 parent ee52ec9 commit 0bac05d

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

src/main/java/fiji/plugin/trackmate/util/cli/CondaCLIConfigurator.java

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
* it under the terms of the GNU General Public License as
99
* published by the Free Software Foundation, either version 3 of the
1010
* License, or (at your option) any later version.
11-
*
11+
*
1212
* This program is distributed in the hope that it will be useful,
1313
* but WITHOUT ANY WARRANTY; without even the implied warranty of
1414
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1515
* GNU General Public License for more details.
16-
*
16+
*
1717
* You should have received a copy of the GNU General Public
1818
* License along with this program. If not, see
1919
* <http://www.gnu.org/licenses/gpl-3.0.html>.
@@ -141,8 +141,10 @@ protected CondaCLIConfigurator()
141141
// The executable stuff.
142142
final String envname = ( String ) s;
143143
cmd.add( envname );
144-
// Only add these flags for conda/mamba, NOT for micromamba
145-
if ( !isMicromamba( condaPath ) )
144+
// Only add '--no-capture-output' if:
145+
// 1. we are NOT using micromamba, and
146+
// 2. we are NOT on Windows (since it breaks .bat)
147+
if ( !isMicromamba( condaPath ) && !os.contains( "win" ) )
146148
{
147149
cmd.add( "--no-capture-output" );
148150
}

0 commit comments

Comments
 (0)