From 647b081cbf8498dcef8715a39ad070d2887f21db Mon Sep 17 00:00:00 2001
From: librelois <elois@ifee.fr>
Date: Tue, 16 Jun 2020 14:04:25 +0200
Subject: [PATCH] [fix] #1414 desktop variant must not need system nodejs
---
gui/duniter-desktop | 34 ++++++++++++++++++++++++++++++++--
1 file changed, 32 insertions(+), 2 deletions(-)
diff --git a/gui/duniter-desktop b/gui/duniter-desktop
index 6a0112e25..4b92e565d 100755
--- a/gui/duniter-desktop
+++ b/gui/duniter-desktop
@@ -11,5 +11,35 @@ cd "$(dirname "${DUNITER_DIRECTORY}")" >/dev/null
DUNITER_DIRECTORY="${PWD}";
popd >/dev/null
-# Execute NW
-"${DUNITER_DIRECTORY}"/node_modules/.bin/nw "${DUNITER_DIRECTORY}"
+duniter_desktop() {
+
+ local NODE
+
+ if [ -z "$DEV_MODE" ]; then
+
+ ### Production mode
+ if [[ -e $DUNITER_DIRECTORY/bin/node ]]; then
+ NODE=$DUNITER_DIRECTORY/bin/node
+ else
+ echo "Node.js is not embedded in this version of Duniter"
+ return
+ fi;
+ else
+
+ ### Cheating with DEV mode
+ DUNITER_DIR=`pwd`
+ NODE=node
+ fi
+
+ VERSION=`$NODE -v`
+
+ if [[ $VERSION != v10* ]]; then
+ echo "$NODE v10 is required";
+ else
+
+ # Execute NW
+ $NODE "${DUNITER_DIRECTORY}"/node_modules/.bin/nw "${DUNITER_DIRECTORY}"
+ fi;
+}
+
+duniter_desktop
--
GitLab