summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAya Morisawa <AyaMorisawa4869@gmail.com>2016-12-30 03:20:25 +0900
committerAya Morisawa <AyaMorisawa4869@gmail.com>2016-12-30 03:20:25 +0900
commitada382f53fabf990aeeff06e6680480acf1aca15 (patch)
tree6931ddc07f88e69a829a8ac6f405f2a7a77c2a65 /src
parentUpdate log message (diff)
downloadsharkey-ada382f53fabf990aeeff06e6680480acf1aca15.tar.gz
sharkey-ada382f53fabf990aeeff06e6680480acf1aca15.tar.bz2
sharkey-ada382f53fabf990aeeff06e6680480acf1aca15.zip
Fix bug
Diffstat (limited to 'src')
-rw-r--r--src/utils/check-dependencies.ts20
1 files changed, 13 insertions, 7 deletions
diff --git a/src/utils/check-dependencies.ts b/src/utils/check-dependencies.ts
index 2378041e27..2b19543915 100644
--- a/src/utils/check-dependencies.ts
+++ b/src/utils/check-dependencies.ts
@@ -2,21 +2,27 @@ import Logger from './logger';
import { exec } from 'shelljs';
export default function(): void {
- checkDependency('Node.js', 'node -v', x => x.match(/^v(.*)\r?\n$/)[1]);
- checkDependency('npm', 'npm -v', x => x.match(/^(.*)\r?\n$/)[1]);
- checkDependency('MongoDB', 'mongo --version', x => x.match(/^MongoDB shell version: (.*)\r?\n$/)[1]);
- checkDependency('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/)[1]);
+ checkDependency('Node.js', 'node -v', x => x.match(/^v(.*)\r?\n$/));
+ checkDependency('npm', 'npm -v', x => x.match(/^(.*)\r?\n$/));
+ checkDependency('MongoDB', 'mongo --version', x => x.match(/^MongoDDB shell version: (.*)\r?\n$/));
+ checkDependency('Redis', 'redis-server --version', x => x.match(/v=([0-9\.]*)/));
}
-function checkDependency(serviceName: string, command: string, transform: (x: string) => string): void {
+function checkDependency(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void {
const code = {
success: 0,
notFound: 127
};
- const x = exec(command, { silent: true }) as any;
let depsLogger = new Logger('Deps');
+ const x = exec(command, { silent: true }) as any;
if (x.code === code.success) {
- depsLogger.info(`${serviceName} ${transform(x.stdout)} found`);
+ let ver = transform(x.stdout);
+ if (ver != null) {
+ depsLogger.info(`${serviceName} ${ver[1]} found`);
+ } else {
+ depsLogger.warn(`${serviceName} not found`);
+ depsLogger.warn(`Regexp used for version check of ${serviceName} is probably messed up`);
+ }
} else if (x.code === code.notFound) {
depsLogger.warn(`${serviceName} not found`);
}