diff options
| author | syuilo⭐️ <Syuilotan@yahoo.co.jp> | 2017-01-25 22:38:45 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 22:38:45 +0900 |
| commit | c52fbef0efc800aa30ad1e20fe60829edf202c1e (patch) | |
| tree | f8337f17d5339702220f6fa556464d55217ba9ea | |
| parent | Update README.md (diff) | |
| parent | [utils] dependencyInfo: use child_process instead of shelljs (diff) | |
| download | misskey-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
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | src/utils/dependencyInfo.ts | 14 |
2 files changed, 5 insertions, 11 deletions
diff --git a/package.json b/package.json index 751bd4f84f..31f3359ec1 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,6 @@ "@types/request": "0.0.39", "@types/rimraf": "0.0.28", "@types/serve-favicon": "2.2.28", - "@types/shelljs": "0.3.33", "@types/twitter": "0.0.28", "@types/uuid": "2.0.29", "@types/vinyl-buffer": "0.0.28", @@ -139,7 +138,6 @@ "rndstr": "1.0.0", "s-age": "1.1.0", "serve-favicon": "2.3.2", - "shelljs": "0.7.6", "subdomain": "1.2.0", "summaly": "1.3.0", "swagger-jsdoc": "1.9.0", 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`); } } |