Commit 61574b18 authored by Éloïs's avatar Éloïs
Browse files

Merge branch 'node8_plug' into '1.6' 

[fix] #1230 The `plug` command was broken by NodeJS 8

See merge request !1226
parents 5d5dbb19 d5e6ebcf

release/arch/arm/build-arm.sh

+3 −3
Original line number Diff line number Diff line
@@ -66,9 +66,9 @@ cd ${RELEASES}/duniter 
echo "Copying Nodejs"

cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node



echo "yarn"

yarn

yarn add duniter-ui@1.6.x --save --production

npm install



npm install duniter-ui@1.6.x --save --production

SRC=`pwd`

echo $SRC

release/arch/debian/build-deb.sh

+2 −15
Original line number Diff line number Diff line
@@ -78,25 +78,12 @@ cd ${RELEASES}/duniter 
# Remove git files

rm -Rf .git

[[ $? -eq 0 ]] && echo ">> VM: building modules..."

[[ $? -eq 0 ]] && yarn

#[[ $? -eq 0 ]] && echo ">> VM: running tests..."

#[[ $? -eq 0 ]] && yarn test

[[ $? -eq 0 ]] && npm install



# Duniter UI

[[ $? -eq 0 ]] && yarn add duniter-ui@1.6.x



[[ $? -eq 0 ]] && npm install duniter-ui@1.6.x

[[ $? -eq 0 ]] && npm prune --production





# Specific modules that are not needed in a release

rm -rf node_modules/materialize-css

rm -rf node_modules/duniter-ui/app

rm -rf node_modules/duniter-ui/vendor

rm -rf node_modules/scryptb/node_modules/node-pre-gyp

rm -rf node_modules/naclb/node_modules/node-pre-gyp

rm -rf node_modules/wotb/node_modules/node-pre-gyp

rm -rf node_modules/sqlite3/build



cp -r "$RELEASES/duniter" "$RELEASES/desktop_"

cp -r "$RELEASES/duniter" "$RELEASES/server_"