Skip to content

Commit d720e2f

Browse files
committed
Work on pkg
1 parent 287a487 commit d720e2f

6 files changed

Lines changed: 17 additions & 22 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ zeronet-win*
77
*.bak
88
config.json
99
*.log
10+
.pkg

package-lock.json

Lines changed: 0 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@
88
"test": "test"
99
},
1010
"dependencies": {
11-
"interface-connection": "^0.3.2",
1211
"merge-recursive": "0.0.3",
13-
"pull-stream-to-stream": "^1.3.4",
1412
"zeronet-client": "file:zeronet-client",
1513
"zeronet-common": "file:zeronet-common",
1614
"zeronet-crypto": "file:zeronet-crypto",
@@ -27,7 +25,7 @@
2725
},
2826
"scripts": {
2927
"test": "bash -c 'set -o pipefail && mocha | bunyan -l 20'",
30-
"pkg": "pkg -t node8-linux-x64,node8-macos-x64,node8-win-x64 .",
28+
"pkg": "bash scripts/pkg.sh",
3129
"start": "node zeronet.js"
3230
},
3331
"keywords": [
@@ -38,9 +36,7 @@
3836
"bin": {
3937
"zeronet": "zeronet.js"
4038
},
41-
"pkg": {
42-
"scripts": "lib/**/*.js"
43-
},
39+
"pkg": {},
4440
"author": "Maciej Krüger <mkg20001@gmail.com>",
4541
"license": "GPL-3.0",
4642
"repository": {

scripts/pkg.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
3+
set -ex
4+
5+
rm -rf .pkg
6+
mkdir .pkg
7+
for f in package.json zeronet.js; do cp $f .pkg; done
8+
ver=$(echo $(cat package.json | grep "version" | sed "s|\"||g" | sed "s| ||g" | grep " .*" -o) | sed "s|,||g")
9+
cd .pkg
10+
sed -r 's|"([a-z-]+)": "file:.*"|"\1": "'$ver'"|g' -i package.json
11+
npm i
12+
pkg -t node8-linux-x64,node8-macos-x64,node8-win-x64 .

scripts/publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ done
1616

1717
files="$files . "
1818

19-
ver=$(echo $(cat package.json | grep "version" | sed "s|\"||g" | sed "s| ||g" | grep " .*" -o))
19+
ver=$(echo $(cat package.json | grep "version" | sed "s|\"||g" | sed "s| ||g" | grep " .*" -o) | sed "s|,||g")
2020

2121
echo "Publishing $files @ $ver"
2222

zeronet-fileserver/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../.gitignore

0 commit comments

Comments
 (0)