From c68c45a2c5c5620a101ce688c957fe75a499271d Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Thu, 4 Jun 2020 14:08:18 +0200
Subject: [PATCH] Change way to install patchwork and launch it

---
 .install/loveland.sh           |  6 +++---
 install.sh                     |  4 ++++
 zen/tools/make_G1SSB_secret.sh | 10 ++++++++--
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.install/loveland.sh b/.install/loveland.sh
index b374f3b..9174848 100755
--- a/.install/loveland.sh
+++ b/.install/loveland.sh
@@ -127,13 +127,13 @@ echo "TODO: add to your /etc/rc.local or systemd or initV !!!"
 
 if [[ ! $isLAN ]]; then 
     ### TODO: unlock oasis restrictions!! CANNOT MAKE PRIVATE MESSAGE => Feddless.social CAN add it as module on loveland portal!!)
-    oasis --allow-host $NODENAME --host $NODENAME --public 2>&1>/dev/null &
+#    oasis --allow-host $NODENAME --host $NODENAME --public 2>&1>/dev/null &
     echo "--public = OASIS STATION IS IN VIEWING MODE ONLY..."
 else
-    oasis --allow-host $NODENAME --host $NODENAME 2>&1>/dev/null &
+#    oasis --allow-host $NODENAME --host $NODENAME 2>&1>/dev/null &
 fi
 
-sleep 5
+#sleep 5
 
 echo '
     __    ____ _    __________                    __
diff --git a/install.sh b/install.sh
index 4ca4f63..3c92d8b 100644
--- a/install.sh
+++ b/install.sh
@@ -33,6 +33,10 @@ curl -s $gitpath/zen/tools/make_G1SSB_secret.sh | bash || exit 1
 # LOVEland install
 curl -s $gitpath/.install/loveland.sh | bash || exit 1
 
+
+
+
+
 # Customs install
 ## Nextcloud
 [[ $args =~ nextcloud ]] && cd /home/$USER/.zen/astroport && sudo -E bash .install/nextcloud/install.sh
diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh
index cc5ca4c..51762df 100755
--- a/zen/tools/make_G1SSB_secret.sh
+++ b/zen/tools/make_G1SSB_secret.sh
@@ -334,8 +334,14 @@ sleep 10
 #sleep 7
 
 # Intall Patchwork
-wget https://github.com/ssbc/patchwork/releases/download/v3.18.0/ssb-patchwork_3.18.0_amd64.deb -O /tmp/patchwork.deb
-sudo dpkg -i /tmp/patchwork.deb
+## Brut way
+## wget https://github.com/ssbc/patchwork/releases/download/v3.18.0/ssb-patchwork_3.18.0_amd64.deb -O /tmp/patchwork.deb
+##sudo dpkg -i /tmp/patchwork.deb
+npm install --global ssb-patchwork
+sleep 2
+
+# Start Patchwork
+ssb-patchwork &
 
 ~/.zen/astroport/zen/ssb_INIT.sh
 ~/.zen/astroport/zen/cron_VRFY.sh