Skip to content

Commit

Permalink
Added command for wine msconvert (Docker)
Browse files Browse the repository at this point in the history
  • Loading branch information
AlanRace committed Mar 4, 2019
1 parent eeeac55 commit d1a7500
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion jimzMLConverter/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>com.alanmrace</groupId>
<artifactId>jimzMLConverter</artifactId>
<version>2.0.3</version>
<version>2.0.4</version>
<packaging>jar</packaging>


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ public class WatersRAWTomzMLConverter {
private static final Logger logger = Logger.getLogger(WatersRAWTomzMLConverter.class.getName());

public static final String CONVERTER_NAME = "ProteoWizard";
public static final String WINE_CONVERTER = "wine msconvert";
public static final String CONVERTER_FILENAME = "msconvert.exe";
//public static final String CONVERTER_x64_LOCATION = "C:\\Program Files\\ProteoWizard";
public static final String CONVERTER_LOCATION = "C:\\Program Files\\ProteoWizard";
Expand Down Expand Up @@ -143,12 +144,12 @@ private static VersionDetails parseVersionDetails(String path) {

public static String getCommand() {
try {
Process process = Runtime.getRuntime().exec(CONVERTER_FILENAME);
Process process = Runtime.getRuntime().exec(WINE_CONVERTER);

// Wait for the conversion to complete
process.waitFor();

return CONVERTER_FILENAME;
return WINE_CONVERTER;
} catch (InterruptedException e) {
e.printStackTrace();
} catch (IOException e) {
Expand Down

0 comments on commit d1a7500

Please sign in to comment.