From d5e6ebcf5f15ca68891776e9abf8804c162e46df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Moreau?= <cem.moreau@gmail.com>
Date: Sun, 17 Dec 2017 17:32:06 +0100
Subject: [PATCH] =?UTF-8?q?[fix]=C2=A0#1230=20The=20`plug`=20command=20was?=
=?UTF-8?q?=20broken=20by=20NodeJS=208?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
release/arch/arm/build-arm.sh | 6 +++---
release/arch/debian/build-deb.sh | 17 ++---------------
2 files changed, 5 insertions(+), 18 deletions(-)
diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh
index cfed67490..68d0bcf45 100755
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
@@ -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
diff --git a/release/arch/debian/build-deb.sh b/release/arch/debian/build-deb.sh
index 72540f48c..528b044cb 100644
--- a/release/arch/debian/build-deb.sh
+++ b/release/arch/debian/build-deb.sh
@@ -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_"
--
GitLab