From 04916677b6eb928409998e65a46f930d23378bd8 Mon Sep 17 00:00:00 2001
From: cgeek <cem.moreau@gmail.com>
Date: Mon, 18 Sep 2017 14:57:42 +0200
Subject: [PATCH] [fix] #1084 WS2P: Update UI to 1.6.x
---
release/arch/arm/build-arm.sh | 2 +-
release/arch/debian/build-deb.sh | 2 +-
release/arch/windows/build.bat | 5 +----
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/release/arch/arm/build-arm.sh b/release/arch/arm/build-arm.sh
index cf6d8fdfb..a43703077 100755
--- a/release/arch/arm/build-arm.sh
+++ b/release/arch/arm/build-arm.sh
@@ -62,7 +62,7 @@ cp -R "$DOWNLOADS/node-${NVER}-linux-${ARCH}" node
echo "yarn"
yarn
-yarn add duniter-ui@1.4.x --save --production
+yarn add duniter-ui@1.6.x --save --production
sed -i "s/duniter\//..\/..\/..\/..\//g" node_modules/duniter-ui/server/controller/webmin.js
SRC=`pwd`
echo $SRC
diff --git a/release/arch/debian/build-deb.sh b/release/arch/debian/build-deb.sh
index ea8f2d36b..8b2b18100 100644
--- a/release/arch/debian/build-deb.sh
+++ b/release/arch/debian/build-deb.sh
@@ -80,7 +80,7 @@ rm -Rf .git
#[[ $? -eq 0 ]] && yarn test
# Duniter UI
-[[ $? -eq 0 ]] && yarn add duniter-ui@1.4.x
+[[ $? -eq 0 ]] && yarn add duniter-ui@1.6.x
[[ $? -eq 0 ]] && sed -i "s/duniter\//..\/..\/..\/..\//g" node_modules/duniter-ui/server/controller/webmin.js
[[ $? -eq 0 ]] && npm prune --production
diff --git a/release/arch/windows/build.bat b/release/arch/windows/build.bat
index b60634f98..1ad0e3434 100644
--- a/release/arch/windows/build.bat
+++ b/release/arch/windows/build.bat
@@ -1,7 +1,4 @@
-set DUNITER_BRANCH=1.4.x
-set VER_UI=%DUNITER_BRANCH%
-
set ADDON_VERSION=48
set NW_VERSION=0.17.6
set NODEJS_VERSION=6.11.1
@@ -46,7 +43,7 @@ call npm cache clean
call npm install
REM call npm test
echo "Ajout du module 1/1 (duniter-ui)..."
-call npm install duniter-ui@%VER_UI% --save --production
+call npm install duniter-ui@1.6.x --save --production
REM sed -i "s/duniter\//..\/..\/..\/..\//g" node_modules/duniter-ui/server/controller/webmin.js
cd node_modules\duniter-ui\server\controller\
powershell -Command "(Get-Content webmin.js) | foreach-object {$_ -replace 'duniter/','../../../../' } | Set-Content webmin.js2"
--
GitLab