Skip to content

Commit a0c7795

Browse files
committed
1 parent 14e677c commit a0c7795

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

apm/PKGBUILD

+9-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# Maintainer: Nicola Squartini <[email protected]>
22

33
pkgname=nodejs-atom-package-manager
4-
pkgver=1.7.1
5-
pkgrel=2
4+
pkgver=1.9.3
5+
pkgrel=1
66
pkgdesc='Atom package manager'
77
arch=('i686' 'x86_64')
88
url='https://github.com/atom/apm'
@@ -13,9 +13,11 @@ makedepends=('npm')
1313
options=(!emptydirs)
1414
source=("https://github.com/atom/apm/archive/v${pkgver}.tar.gz"
1515
'electron-version.patch'
16+
'truncated-json-output.patch'
1617
'use-system-nodejs.patch')
17-
sha256sums=('7001da4ed327b3e52a4d16342649124243eec87d4d4a277524a651550c29c3c6'
18-
'eb72cc1c35697b85be11ae9e7d08a648c16c7d0e6fec034e00cffbe465e006e7'
18+
sha256sums=('13409ce7b4f93ba99fb7dbc7c7e14576772bff6eb635b1b6a83b4c669b4df131'
19+
'f8224823940b6ac6dfce3c7cd82dfc8e3461681c0a2ec49836360043c45e4fb0'
20+
'5b82ddc531a7ac477041fb492cc95532022e19449168784d87c5e31079255036'
1921
'66dfc84b5cd76dd02ef6cf04d532cdb2ff6a6eaa4d94bf47ab5ed81d9e13326c')
2022

2123
prepare() {
@@ -29,6 +31,9 @@ prepare() {
2931
# keytar-3.0.1 pins the version of nan to 2.0.0, and fails to compile with
3032
# nodejs-6.0.0
3133
sed -e 's|"keytar": "^3.0"|"keytar": "3.0.0"|' -i package.json
34+
35+
# Fix the callback that runs process.exit() before JSON output completes
36+
patch -Np1 -i ${srcdir}/truncated-json-output.patch
3237
}
3338

3439
build() {

apm/electron-version.patch

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
path = require('path');
1515

1616
_ = require('underscore-plus');
17-
@@ -126,6 +128,11 @@
17+
@@ -142,6 +144,11 @@
1818
_this.installedAtomVersion = version;
1919
}
2020
} catch (_error) {}

apm/truncated-json-output.patch

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
--- a/src/list.coffee
2+
+++ b/src/list.coffee
3+
@@ -166,8 +166,7 @@
4+
@listGitPackages options, (error, packages) ->
5+
return callback(error) if error
6+
output.git = packages
7+
- console.log JSON.stringify(output)
8+
- callback()
9+
+ process.stdout.write JSON.stringify(output) + '\n', callback
10+
11+
run: (options) ->
12+
{callback} = options

0 commit comments

Comments
 (0)