From 92af4401e22749e726bce69c3bd02c627e7af7e6 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Fri, 1 Nov 2019 22:34:26 +0900
Subject: 実行時にpackage.jsonを参照しないように (#5418)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 実行時にpackage.jsonを参照しないように

* nodeinfo

* move meta.json

* add dummy

* lowercase
---
 src/boot/master.ts | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/boot')

diff --git a/src/boot/master.ts b/src/boot/master.ts
index 381c4bc4ca..1517de1586 100644
--- a/src/boot/master.ts
+++ b/src/boot/master.ts
@@ -8,7 +8,6 @@ import Logger from '../services/logger';
 import loadConfig from '../config/load';
 import { Config } from '../config/types';
 import { lessThan } from '../prelude/array';
-import * as pkg from '../../package.json';
 import { program } from '../argv';
 import { showMachineInfo } from '../misc/show-machine-info';
 import { initDb } from '../db/postgre';
@@ -16,10 +15,10 @@ import { initDb } from '../db/postgre';
 const logger = new Logger('core', 'cyan');
 const bootLogger = logger.createSubLogger('boot', 'magenta', false);
 
-function greet() {
+function greet(config: Config) {
 	if (!program.quiet) {
 		//#region Misskey logo
-		const v = `v${pkg.version}`;
+		const v = `v${config.version}`;
 		console.log('  _____ _         _           ');
 		console.log(' |     |_|___ ___| |_ ___ _ _ ');
 		console.log(' | | | | |_ -|_ -| \'_| -_| | |');
@@ -35,21 +34,21 @@ function greet() {
 	}
 
 	bootLogger.info('Welcome to Misskey!');
-	bootLogger.info(`Misskey v${pkg.version}`, null, true);
+	bootLogger.info(`Misskey v${config.version}`, null, true);
 }
 
 /**
  * Init master process
  */
 export async function masterMain() {
-	greet();
-
 	let config!: Config;
 
 	try {
 		// initialize app
 		config = await init();
 
+		greet(config);
+
 		if (config.port == null || Number.isNaN(config.port)) {
 			bootLogger.error('The port is not configured. Please configure port.', null, true);
 			process.exit(1);
-- 
cgit v1.2.3-freya