Merge pull request #2 from tamaina/master

追従

4 files changed, 7 insertions, 4 deletions

diff --git a/src/utils/cli/progressbar.ts b/src/utils/cli/progressbar.ts
index 4afb4b0904..72496fdedc 100644
--- a/src/utils/cli/progressbar.ts
+++ b/src/utils/cli/progressbar.ts
@@ -1,6 +1,6 @@
 import { EventEmitter } from 'events';
 import * as readline from 'readline';
-import * as chalk from 'chalk';
+import chalk from 'chalk';
 
 /**
  * Progress bar
diff --git a/src/utils/dependencyInfo.ts b/src/utils/dependencyInfo.ts
index 818fa3136c..89af0d20fb 100644
--- a/src/utils/dependencyInfo.ts
+++ b/src/utils/dependencyInfo.ts
@@ -11,7 +11,7 @@ export default class {
 	public showAll(): void {
 		this.show('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version:? (.*)\r?\n/));
 		this.show('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/));
-		this.show('GraphicsMagick', 'gm -version', x => x.match(/^GraphicsMagick ([0-9\.]*) .*/));
+		this.show('ImageMagick', 'magick -version', x => x.match(/^Version: ImageMagick (.+?)\r?\n/));
 	}
 
 	public show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void {
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
index ecfacbc952..fae1042c39 100644
--- a/src/utils/logger.ts
+++ b/src/utils/logger.ts
@@ -1,8 +1,8 @@
-import * as chalk from 'chalk';
+import chalk, { Chalk } from 'chalk';
 
 export type LogLevel = 'Error' | 'Warn' | 'Info';
 
-function toLevelColor(level: LogLevel): chalk.ChalkStyle {
+function toLevelColor(level: LogLevel): Chalk {
 	switch (level) {
 		case 'Error': return chalk.red;
 		case 'Warn': return chalk.yellow;
diff --git a/src/utils/type.ts b/src/utils/type.ts
new file mode 100644
index 0000000000..ba6ea0be77
--- /dev/null
+++ b/src/utils/type.ts
@@ -0,0 +1,3 @@
+// https://github.com/Microsoft/TypeScript/issues/12215
+export type Diff<T extends string, U extends string> = ({ [P in T]: P } & { [P in U]: never } & { [x: string]: never })[T];
+export type Omit<T, K extends keyof T> = { [P in Diff<keyof T, K>]: T[P] };