🎨 Use atom-package-path to determine caller package name

steelbrain · Feb 8, 2016 · 8aa6afc · 8aa6afc
1 parent 6ad2622
commit 8aa6afc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git 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
@@ -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()