From 8aa6afcb79410da43f06cfdbde0cc19e16b97278 Mon Sep 17 00:00:00 2001 From: steelbrain Date: Mon, 8 Feb 2016 18:39:40 +0500 Subject: [PATCH] :art: Use atom-package-path to determine caller package name --- lib/helpers.js | 6 ------ lib/main.js | 11 +++++------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/lib/helpers.js b/lib/helpers.js index 7c6cb4e..444af81 100644 --- a/lib/helpers.js +++ b/lib/helpers.js @@ -2,12 +2,6 @@ import {BufferedProcess} from 'atom' const extractionRegex = /Installing (.*?) to .* (.*)/ -const nameRegex = /(\\|\/)packages(\\|\/)(.*?)(\\|\/)/ - -export function guessName(filePath) { - const matches = nameRegex.exec(filePath) - return matches ? matches[3] : null -} export function installPackages(dependencies, progressCallback) { return new Promise(function(resolve, reject) { diff --git a/lib/main.js b/lib/main.js index 1a9683f..d50956e 100644 --- a/lib/main.js +++ b/lib/main.js @@ -11,12 +11,11 @@ if (typeof window.__steelbrain_package_deps === 'undefined') { export function install(name = null, enablePackages = false) { if (!name) { - const filePath = require('sb-callsite').capture()[1].file - name = guessName(filePath) - if (!name) { - console.log(`Unable to get package name for file: ${filePath}`) - return Promise.resolve() - } + name = require('atom-package-path').guess() + } + if (!name) { + console.log(`Unable to get package name for file: ${filePath}`) + return Promise.resolve() } const {toInstall, toEnable} = packagesToInstall(name) let promise = Promise.resolve()