summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo⭐️ <Syuilotan@yahoo.co.jp>2017-01-25 22:38:45 +0900
committerGitHub <noreply@github.com>2017-01-25 22:38:45 +0900
commitc52fbef0efc800aa30ad1e20fe60829edf202c1e (patch)
treef8337f17d5339702220f6fa556464d55217ba9ea /src
parentUpdate README.md (diff)
parent[utils] dependencyInfo: use child_process instead of shelljs (diff)
downloadmisskey-c52fbef0efc800aa30ad1e20fe60829edf202c1e.tar.gz
misskey-c52fbef0efc800aa30ad1e20fe60829edf202c1e.tar.bz2
misskey-c52fbef0efc800aa30ad1e20fe60829edf202c1e.zip
Merge pull request #75 from armchair-philosophy/drop_shelljs
[utils] dependencyInfo: use child_process instead of shelljs
Diffstat (limited to 'src')
-rw-r--r--src/utils/dependencyInfo.ts14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/utils/dependencyInfo.ts b/src/utils/dependencyInfo.ts
index 9d2c6a1d4f..c7c1441ec1 100644
--- a/src/utils/dependencyInfo.ts
+++ b/src/utils/dependencyInfo.ts
@@ -1,5 +1,5 @@
import Logger from './logger';
-import { exec } from 'shelljs';
+import { execSync } from 'child_process';
export default class {
logger: Logger;
@@ -15,20 +15,16 @@ export default class {
}
show(serviceName: string, command: string, transform: (x: string) => RegExpMatchArray): void {
- const code = {
- success: 0,
- notFound: 127
- };
- const x = exec(command, { silent: true }) as any;
- if (x.code === code.success) {
- let ver = transform(x.stdout);
+ try {
+ const x = execSync(command, { stdio: ['pipe', 'pipe', 'ignore'] });
+ const ver = transform(x.toString());
if (ver != null) {
this.logger.info(`${serviceName} ${ver[1]} found`);
} else {
this.logger.warn(`${serviceName} not found`);
this.logger.warn(`Regexp used for version check of ${serviceName} is probably messed up`);
}
- } else if (x.code === code.notFound) {
+ } catch (e) {
this.logger.warn(`${serviceName} not found`);
}
}