summaryrefslogtreecommitdiff
path: root/src/misc
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2018-07-14 21:59:15 +0900
committerAya Morisawa <AyaMorisawa4869@gmail.com>2018-07-14 21:59:15 +0900
commit4d2c0e41616111b6b13f8688bd7b15d0867b0bdd (patch)
tree084711d00c9c4cda1436b2a16b614192361aeab6 /src/misc
parentUpdate log messages (diff)
downloadsharkey-4d2c0e41616111b6b13f8688bd7b15d0867b0bdd.tar.gz
sharkey-4d2c0e41616111b6b13f8688bd7b15d0867b0bdd.tar.bz2
sharkey-4d2c0e41616111b6b13f8688bd7b15d0867b0bdd.zip
Update dependency checking for ImageMagick
Diffstat (limited to 'src/misc')
-rw-r--r--src/misc/dependencyInfo.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/misc/dependencyInfo.ts b/src/misc/dependencyInfo.ts
index 829f8d9809..9f443b126d 100644
--- a/src/misc/dependencyInfo.ts
+++ b/src/misc/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('ImageMagick', 'magick -version', x => x.match(/^Version: ImageMagick (.+?)\r?\n/));
+ this.show('ImageMagick', 'magick -version', x => x.match(/^Version: ImageMagick ([^ ]*)/));
}
public show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void {