From c6d84743c8ab9115beb91ca011ff8a95226ecbc2 Mon Sep 17 00:00:00 2001
From: qo-op <support@qo-op.com>
Date: Tue, 24 Mar 2020 03:10:28 +0100
Subject: [PATCH] ssb install node_modules

---
 .install/scuttlebutt.sh | 14 ++++++++++----
 zen/ssb_INIT.sh         |  3 ++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh
index 6fa7b28..f9062c8 100755
--- a/.install/scuttlebutt.sh
+++ b/.install/scuttlebutt.sh
@@ -18,8 +18,14 @@ scuttlebutt() {
 		[[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport
         cd ~/.ssb_astroport
 
+		### Install module in ~/.ssb_astroport/node_modules
 		npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query 
 		npm install -g ssb-server
+		
+		# Move node_modules with ssb-server (why do I have to do that?)
+		ssbSERVER=$(which ssb-server)
+		node_modules_path=$(echo $ssbSERVER | sed s/bin\\/ssb-server/lib/)
+		mv ~/.ssb_astroport/node_modules/* $node_modules_path/
     fi
     
 	# TEST ssb-server Install
@@ -49,8 +55,8 @@ echo "
             _|           
 $nodename
 "
-	if [[ $extension == "" ]]; then
-
+	if [[ ! $extension ]]; then
+		nodename=$nodename.home
 		# LOCAL
 		cat > ~/.ssb/config <<EOF
 {
@@ -71,7 +77,7 @@ cat > ~/.zen/run-ssb_$nodename.sh <<EOF
 #!/bin/bash
 echo _$ > ~/.zen/ssb.pid.bash
 while true; do
-  ssb-server start 2>dev/null
+  ssb-server start
   echo _! > ~/.zen/ssb.pid
 done
 EOF
@@ -105,7 +111,7 @@ cat > ~/.zen/run-ssb_$nodename.sh <<EOF
 #!/bin/bash
 echo _$ > ~/.zen/ssb.pid.bash
 while true; do
-  ssb-server start --host $nodename 2>dev/null
+  ssb-server start --host $nodename
   echo _! > ~/.zen/ssb.pid
 done
 EOF
diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh
index f83d6e1..5c52b31 100755
--- a/zen/ssb_INIT.sh
+++ b/zen/ssb_INIT.sh
@@ -76,7 +76,7 @@ echo "$ssbpub" > ~/.zen/ipfs/.$ipfsnodeid/G1SSB/_ssb.whoami
 echo "$g1pub" > ~/.zen/ipfs/.$ipfsnodeid/G1SSB/_g1.pubkey
 
 IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
-NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS)
+NODEIPNS=$(ipfs name publish --allow-offline --quieter /ipfs/$IWALLETS)
 
 echo "
 $ssbpub
@@ -87,6 +87,7 @@ $g1pub
  / ___/ |___ ___| |__   (_)_ __  / _|___ 
 | |  _| / __/ __| |_ \  | |  _ \| |_/ __|
 | |_| | \__ \__ \ |_) | | | |_) |  _\__ \
+
  \____|_|___/___/_ __/  |_|  __/|_| |___/
                           |_|