From 936d9fe30697e4651cba04d505393e05f8c902c1 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 11 Nov 2021 21:45:36 +0200
Subject: [PATCH] Updated release scripts.

---
 releases/maintainer-make-bundle-a.sh | 32 +++++++---------------------
 releases/maintainer-make-bundle-o.sh | 17 ++++++---------
 releases/maintainer-make-bundle-s.sh | 12 +++++------
 3 files changed, 20 insertions(+), 41 deletions(-)

diff --git a/releases/maintainer-make-bundle-a.sh b/releases/maintainer-make-bundle-a.sh
index 71ef923a5..e2c200fc3 100755
--- a/releases/maintainer-make-bundle-a.sh
+++ b/releases/maintainer-make-bundle-a.sh
@@ -10,36 +10,20 @@ if [ $# -ne 1 ]
     exit 1
 fi
 
-cd ~/repos
+sudo apt -y install g++ build-essential
+sudo npm -g install node-gyp
 rm -rf bundle
-
+#rm wekan-$1.zip
+#wget https://releases.wekan.team/wekan-$1.zip
 unzip wekan-$1.zip
-
-sudo chown wekan:wekan bundle -R
-sudo apt -y install libcurl4-openssl-dev
-
-sudo rm -f /home/wekan/repos/bundle/programs/server/node_modules/.bin/node-pre-gyp
-sudo rm -f /home/wekan/repos/bundle/programs/server/node_modules/.bin/node-gyp
-sudo rm -rf /home/wekan/repos/bundle/programs/server/npm/node_modules/meteor/lucasantoniassi_accounts-lockout/node_modules/.phantomjs-prebuilt-garbage-*
-sudo rm -rf /home/wekan/repos/bundle/programs/server/node_modules/.bin/*
-sudo rm -rf /home/wekan/repos/bundle/programs/server/node_modules/node-pre-gyp/node_modules/.bin/*
-sudo rm -rf /home/wekan/repos/bundle/programs/server/node_modules/node-gyp/node_modules/.bin/*
-sudo rm -rf /home/wekan/repos/bundle/programs/server/npm/node_modules/meteor/ostrio_files/node_modules/request-libcurl/.node_modules-garbage*
-
 cd bundle/programs/server
 chmod u+w *.json
-npm uninstall fibers node-gyp node-pre-gyp @mapbox/node-pre-gyp
-npm install
-npm install node-gyp
-npm install @mapbox/node-pre-gyp
-npm install fibers
-
-cd /home/wekan/repos/bundle
+cd node_modules/fibers
+node build.js
+cd ../../../..
 find . -type d -name '*-garbage*' | xargs rm -rf
 find . -name '*phantom*' | xargs rm -rf
 find . -name '.*.swp' | xargs rm -f
 find . -name '*.swp' | xargs rm -f
-
-cd /home/wekan/repos
-
+cd ..
 zip -r wekan-$1-arm64.zip bundle
diff --git a/releases/maintainer-make-bundle-o.sh b/releases/maintainer-make-bundle-o.sh
index 51004dc4f..db1f310fb 100755
--- a/releases/maintainer-make-bundle-o.sh
+++ b/releases/maintainer-make-bundle-o.sh
@@ -3,9 +3,6 @@
 # This script is only for Wekan maintainer to
 # convert x64 bundle to ppc64le bundle.
 
-# 1) Check that there is only one parameter
-#    of Wekan version number
-
 if [ $# -ne 1 ]
   then
     echo "Syntax with Wekan version number:"
@@ -13,19 +10,17 @@ if [ $# -ne 1 ]
     exit 1
 fi
 
-# 2) Build bundle
-
-cd /home/ubuntu
+sudo apt -y install g++ build-essential
+sudo npm -g install node-gyp
 rm -rf bundle
+#rm wekan-$1.zip
 #wget https://releases.wekan.team/wekan-$1.zip
 unzip wekan-$1.zip
-cd /home/ubuntu/bundle/programs/server
+cd bundle/programs/server
 chmod u+w *.json
-cd /home/ubuntu/bundle/programs/server/node_modules/fibers
+cd node_modules/fibers
 node build.js
-cd /home/ubuntu
-#cp -pR /home/ubuntu/node-fibers/bin/linux-ppc64-72-glibc bundle/programs/server/node_modules/fibers/bin/
-cd bundle
+cd ../../../..
 find . -type d -name '*-garbage*' | xargs rm -rf
 find . -name '*phantom*' | xargs rm -rf
 find . -name '.*.swp' | xargs rm -f
diff --git a/releases/maintainer-make-bundle-s.sh b/releases/maintainer-make-bundle-s.sh
index eae1f82f3..490c28cec 100755
--- a/releases/maintainer-make-bundle-s.sh
+++ b/releases/maintainer-make-bundle-s.sh
@@ -10,16 +10,16 @@ if [ $# -ne 1 ]
     exit 1
 fi
 
-cd /home/linux1
+sudo npm -g install node-gyp
 rm -rf bundle
+#rm wekan-$1.zip
+#wget https://releases.wekan.team/wekan-$1.zip
 unzip wekan-$1.zip
-cd /home/linux1/bundle/programs/server
+cd bundle/programs/server
 chmod u+w *.json
-cd /home/linux1/bundle/programs/server/node_modules/fibers
+cd node_modules/fibers
 node build.js
-cd /home/linux1
-#cp -pR /home/linux1/node-fibers/bin/linux-s390x-83-glibc bundle/programs/server/node_modules/fibers/bin/
-cd bundle
+cd ../../../..
 find . -type d -name '*-garbage*' | xargs rm -rf
 find . -name '*phantom*' | xargs rm -rf
 find . -name '.*.swp' | xargs rm -f