Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-09-08 13:44:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

fix(pkg-install): Use the package.json name, not the folder name

Browse source
This commit is contained in:
Ben Gotow 2016-05-18 15:25:15 -07:00
parent e93a5d7b7f
commit 5f7d3ac2e9
2 changed files with 24 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal_packages/plugins/lib/packages-store.jsx
View file

@ -226,11 +226,13 @@ const PackagesStore = Reflux.createStore({
},
(filenames) => {
if (!filenames || filenames.length === 0) return;
NylasEnv.packages.installPackageFromPath(filenames[0], (err) => {
if (err) return;
const packageName = path.basename(filenames[0]);
const msg = `${packageName} has been installed and enabled. No need to restart! If you don't see the plugin loaded, check the console for errors.`
this._displayMessage("Plugin installed! 🎉", msg);
NylasEnv.packages.installPackageFromPath(filenames[0], (err, packageName) => {
if (err) {
this._displayMessage("Could not install plugin", err.message);
} else {
const msg = `${packageName} has been installed and enabled. No need to restart! If you don't see the plugin loaded, check the console for errors.`
this._displayMessage("Plugin installed! 🎉", msg);
}
});
});
},

57
src/package-manager.coffee
View file

@ -327,10 +327,20 @@ class PackageManager
packages
installPackageFromPath: (packageSourceDir, callback) ->
return unless @verifyValidPackage(packageSourceDir, callback)
jsonPath = path.join(packageSourceDir, 'package.json');
if not fs.existsSync(jsonPath)
return callback(new Error("The folder you selected doesn't look like a valid N1 plugin. All N1 plugins must have a package.json file in the top level of the folder. Check the contents of #{packageSourceDir} and try again."), null)
try
json = JSON.parse(fs.readFileSync(jsonPath))
catch e
return callback(e, null)
if not json.name
return callback(new Error("The package.json file must contain a valid `name` value."), null)
packagesDir = path.join(NylasEnv.getConfigDirPath(), 'packages')
packageName = path.basename(packageSourceDir)
packageName = json.name
packageTargetDir = path.join(packagesDir, packageName)
fs.makeTree packagesDir, (err) =>
@ -338,50 +348,17 @@ class PackageManager
fs.exists packageTargetDir, (packageAlreadyExists) =>
if packageAlreadyExists
message = "A package named '#{packageName}' is already installed
in ~/.nylas/packages."
remote.dialog.showMessageBox({
type: 'warning'
buttons: ['OK']
title: 'Package already installed'
detail: 'Remove it before trying to install another package of the same name.'
message: message
})
callback(new Error(message), null)
return
return callback(new Error("A package named '#{packageName}' is already installed in ~/.nylas/packages."), null)
fs.copySync(packageSourceDir, packageTargetDir)
apm = new APMWrapper()
apm.installDependenciesInPackageDirectory packageTargetDir, (err) =>
if err
remote.dialog.showMessageBox({
type: 'warning'
buttons: ['OK']
title: 'Package installation failed'
message: err.toString()
})
callback(err, packageTargetDir)
else
@enablePackage(packageTargetDir)
@activatePackage(packageName)
callback(null, packageTargetDir)
return callback(err, packageTargetDir) if err
@enablePackage(packageTargetDir)
@activatePackage(packageName)
callback(null, packageName)
verifyValidPackage: (packageSourceDir, callback) ->
if fs.existsSync(path.join(packageSourceDir, 'package.json'))
return true
else
errMsg = "The folder you selected doesn't look like a valid N1 plugin. All N1 plugins must have a package.json file in the top level of the folder. Check the contents of #{packageSourceDir} and try again"
remote.dialog.showMessageBox({
type: 'warning'
buttons: ['OK']
title: 'Not a valid plugin folder'
message: errMsg
})
callback(errMsg)
return false
###
Section: Private
###