Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-07 16:12:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes #5853

Browse Source
This commit is contained in:
Julian Lam
2017-08-03 12:06:01 -04:00
parent 29e7bdbc99
commit 4f9cbabec3
6 changed files with 75 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/data.js
View File

@@ -44,9 +44,20 @@ function loadPluginInfo(pluginPath, callback) {
}
var pluginData;
var packageData;
var licenseData;
try {
pluginData = JSON.parse(results.plugin);
packageData = JSON.parse(results.package);
try {
licenseData = require('spdx-license-list/licenses/' + packageData.license);
pluginData.license = {
name: licenseData.name,
text: licenseData.licenseText,
};
} catch (e) {
// No license matched
pluginData.license = null;
}
pluginData.id = packageData.name;
pluginData.name = packageData.name;
@@ -55,7 +66,6 @@ function loadPluginInfo(pluginPath, callback) {
pluginData.repository = packageData.repository;
pluginData.nbbpm = packageData.nbbpm;
pluginData.path = pluginPath;
pluginData.license = packageData.license;
} catch (err) {
var pluginDir = path.basename(pluginPath);