diff --git a/internal_packages/onboarding/lib/initial-packages-store.coffee b/internal_packages/onboarding/lib/initial-packages-store.coffee index 01f7fe117..01f7058f5 100644 --- a/internal_packages/onboarding/lib/initial-packages-store.coffee +++ b/internal_packages/onboarding/lib/initial-packages-store.coffee @@ -7,7 +7,12 @@ class InitialPackagesStore extends NylasStore constructor: -> @starterPackages = [] {resourcePath} = atom.getLoadSettings() - @starterPackagesPath = path.join(resourcePath, "examples") + + if resourcePath.indexOf('app.asar') != -1 + @starterPackagesPath = path.join(resourcePath,'..', 'app.asar.unpacked', 'examples') + else + @starterPackagesPath = path.join(resourcePath, "examples") + @lastError = null @loadStarterPackages() diff --git a/internal_packages/plugins/lib/packages-store.coffee b/internal_packages/plugins/lib/packages-store.coffee index 66ec4121f..dde1949a3 100644 --- a/internal_packages/plugins/lib/packages-store.coffee +++ b/internal_packages/plugins/lib/packages-store.coffee @@ -162,8 +162,15 @@ PackagesStore = Reflux.createStore @_apm.update(pkg, pkg.newerVersion) _onInstallPackage: -> + {resourcePath} = atom.getLoadSettings() + if resourcePath.indexOf('app.asar') != -1 + starterPackagesPath = path.join(resourcePath,'..', 'app.asar.unpacked', 'examples') + else + starterPackagesPath = path.join(resourcePath, "examples") + dialog.showOpenDialog title: "Choose a Package Directory" + defaultPath: starterPackagesPath properties: ['openDirectory'] , (filenames) => return if not filenames or filenames.length is 0 diff --git a/src/flux/stores/account-store.coffee b/src/flux/stores/account-store.coffee index a58d4f6fa..79d8fabfc 100644 --- a/src/flux/stores/account-store.coffee +++ b/src/flux/stores/account-store.coffee @@ -163,7 +163,6 @@ class AccountStore unread: threadUnread snippet: threadMessages[0].snippet starred: threadMessages[0].starred - labels: threadMessages[0].labels ) messages = messages.concat(threadMessages) threads.push(thread)