Skip to content

Commit

Permalink
- e upgraded typescript
Browse files Browse the repository at this point in the history
Co-Authored-By: Ilyas Landikov <[email protected]>
  • Loading branch information
isidore and ilandikov committed Apr 29, 2024
1 parent 6e5a230 commit a55e073
Showing 1 changed file with 16 additions and 20 deletions.
36 changes: 16 additions & 20 deletions lib/Reporting/Reporters/diffmergeReporter.ts
Original file line number Diff line number Diff line change
@@ -1,29 +1,25 @@
'use strict';

var autils = require('../../AUtils');
var GenericDiffReporterBase = require('../GenericDiffReporterBase');
var shelljs = require('shelljs');
var osTools = require('../../osTools');
import GenericDiffReporterBase from '../GenericDiffReporterBase';
import * as shelljs from 'shelljs';
import {platform} from "../../osTools";
import {searchForExecutable} from "../../AUtils";

class Reporter extends GenericDiffReporterBase {

constructor() {
constructor() {
super("DiffMerge");

super("DiffMerge");
let app: string | null = null;
if (platform.isMac) {
try {
app = shelljs.ls('/Applications/DiffMerge.app/Contents/MacOS/DiffMerge')[0];
} catch (err) {
console.error(err);
}
}

var app = null;
if (osTools.platform.isMac) {
try {
app = shelljs.ls('/Applications/DiffMerge.app/Contents/MacOS/DiffMerge')[0];
} catch (err) {
console.error(err);
}
this.exePath = app || searchForExecutable("DiffMerge");
}

this.exePath = app || autils.searchForExecutable("DiffMerge");

}

}

module.exports = Reporter;
export = Reporter;

0 comments on commit a55e073

Please sign in to comment.