Update

Author: mkg20001

.gitignore

@@ -11,3 +11,4 @@ config.json
 py
 coverage
 .nyc_output
+*.tar.gz

.travis.yml

@@ -10,7 +10,7 @@ install:
 after_success:
   - npm run report-coverage       #Run codecov
 deploy:
-  provider:     releases
+  provider: releases
   api_key:
     secure:     DvHYEbD0wJWlg12gHHyqYIss5HcijjXel0fas3PX8p1+DjWFAGcn7M6/N7Lo177FF284kbOHzsy+tI2mCeK0CsNvtYpGhebeivVuWqKhAXpqv4PXUp+HbRYxHy9IsHUUbxgwmlQDx0+txytflvvuHbOVGA/pRFdLVv9VJi2cgNf6xGZIihZ8hAKRRjVAaa1czmTQBjhcG+W97T06CaTo+VBUWa98jldD3UAfZq0q52iU16Oq+bL8avC0gh5eYZ4NOBSvXC1VGuSP9VJ5aOOrDc1GYagQvjPg1bI6FR1n4zeL5gsKXhU3JUxorMxpB8ARvw17kW1gfavOjcvbB0FtfnDcs67KAIyzAEDuw7pC/0Bn8vEP2gTOnYt8uqs9s1lUYpDZpxgvTNQ0PzjbuzolQA03Kr0fheUxZBB8mFwacc1UTXw9fmOhbVXjlikQge+eTejRalgn+RZrKVj3NL8428Lmeb5vQOm07DglF5Ej7siNwGIEySAqYYUHAyYyTXIrWfjuXqmeaTFyNCKbyo06vS02lVwz6GVypsJOztOHsBpKjyxLm8zM0gpWeTcJXokKnbs3Q9wqCzprIPT/PT6gPvxeARi4z7Iv7TAAOGmdi9IoEjQ4Wy9S3W3/pdIAAGrBKTl+atkTSykIIju+ei3ZmB7BG7aMb4QHOcxa6YGoMnA=
   file:         zeronet-*

scripts/pkg.sh

@@ -7,6 +7,6 @@ mkdir .pkg
 for f in package.json zeronet.js; do cp $f .pkg; done
 ver=$(echo $(cat package.json | grep "version" | sed "s|\"||g" | sed "s|  ||g" | grep " .*" -o) | sed "s|,||g")
 cd .pkg
-sed -r 's|"([a-z-]+)": "file:.*"|"\1": "'$ver'"|g' -i package.json
+sed -r 's|"([a-z-]+)": "file:(.*)"|"\1": "file:../\2.tar.gz"|g' -i package.json
 npm i --production
 pkg -t node8-linux-x64,node8-macos-x64,node8-win-x64 .

scripts/publish.sh

@@ -1,7 +1,5 @@
 #!/bin/bash
 
-#TODO: replace by better solution
-
 set -e
 
 op="$PWD"
@@ -20,22 +18,43 @@ ver=$(echo $(cat package.json | grep "version" | sed "s|\"||g" | sed "s|  ||g" |
 
 echo "Publishing $files @ $ver"
 
-echo "Sure?"
+for file in . $(dir -w 1 | grep "^zeronet-"); do
+  if [ -d $file ]; then
+    cd $file
+    sed -r 's|"([a-z-]+)": "file:.*"|"\1": "'$ver'"|g' -i package.json
+    cd $op
+  fi
+done
+
+for dir in $files; do
+  cd $dir
+    [ ! -e .gitignore ] && ln -s ../.gitignore
+  cd $op
+done
+
+bash scripts/tarball.sh
+
+tarfiles="zeronet.tar.gz"
+for file in files; do
+  tarfiles="$tarfiles $file.tar.gz"
+done
+
+echo "This will 'npm publish $tarfiles'"
 
-sed -r 's|"([a-z-]+)": "file:.*"|"\1": "'$ver'"|g' -i package.json
+echo "Sure?"
 
 read foo
 
 [ "$foo" != "yes" ] && echo "Abort." && exit 2
 
-set -x
-
-for dir in $files; do
-  cd $dir
-    [ ! -e .gitignore ] && ln -s ../.gitignore
-    npm publish
-  cd ..
-done
+npm publish $tarfiles
 
 cd $op
-sed -r 's|"(zeronet-[a-z-]+)": ".*"|"\1": "file:\1"|g' -i package.json
+
+for file in . $(dir -w 1 | grep "^zeronet-"); do
+  if [ -d $file ]; then
+    cd $file
+    sed -r 's|"(zeronet-[a-z-]+)": ".*"|"\1": "file:\1"|g' -i package.json
+    cd $op
+  fi
+done

scripts/tarball.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -e
+
+ex_re() {
+  ex="--exclude=zeronet* --exclude=package-lock.json"
+  for f in .git .gitignore .travis.yml debug scripts $(cat .gitignore); do
+    ex="$ex --exclude=$f"
+  done
+}
+
+ex_re
+tar cvfz zeronet.tar.gz $ex . | sed "s|^|zeronet: |g"
+ex_re
+
+for file in $(dir -w 1 | grep "^zeronet-"); do
+  if [ -d $file ]; then
+    cd $file
+    tar cvfz ../$file.tar.gz $ex . | sed "s|^|$file: |g"
+    ex_re
+    cd ..
+  fi
+done

test/tls/tls-handshake.js test/crypto/crypto-handshake.jstest/tls/tls-handshake.js renamed to test/crypto/crypto-handshake.js

@@ -42,7 +42,7 @@ cryptos.forEach(crypto => {
             inner_path: "content.json",
             location: 1
           }, err => {
-            if (err) console.error("Error, but not failing the test", err)
+            if (err) console.error("Unrelated error", err)
             return cb()
           })
         })