From fefa4a6a88af4fba730624eeaf89ef4225b8c0a4 Mon Sep 17 00:00:00 2001 From: qo-op Date: Sun, 22 Mar 2020 06:39:43 +0100 Subject: [PATCH] ssb-server Pub vs Patchwork --- zen/ssb_INIT.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/zen/ssb_INIT.sh b/zen/ssb_INIT.sh index 361ea89..6e34434 100755 --- a/zen/ssb_INIT.sh +++ b/zen/ssb_INIT.sh @@ -41,7 +41,7 @@ mkdir -p ~/.zen/ipfs/.$IPFSNODEID/G1SSB EXTERNAL=$(cat /etc/hostname).local -[[ "$1" == "KILL" ]] && rm ~/.ssb/config && kill -9 $(cat ~/.zen/ssb.pid.bash) && killall node && echo " +[[ "$1" == "KILL" ]] && rm -f ~/.ssb/config && kill -9 $(cat ~/.zen/ssb.pid.bash) && killall node && echo " _ _ _ _ | | (_) | | | | ___| | | @@ -55,7 +55,7 @@ ssbpub=$(sbotc whoami 2>/dev/null | jq -r .id) if [[ $ssbpub == "" ]]; then [[ "$1" == "RESET" ]] && rm -Rf ~/.ssb.$USER -[[ -d ~/.ssb.$USER ]] && echo "Backup already exists $USER. $MY_PATH/$ME RESET to remove..." && exit 1 +[[ -d ~/.ssb.$USER ]] && echo "Backup already exists $USER. RESET autoremove... MANUAL : rm -Rf ~/.ssb.$USER " && exit 1 [[ -d ~/.ssb ]] && mv ~/.ssb ~/.ssb.$USER && rm -Rf ~/.ssb # BACKUP ~/.ssb mkdir -p ~/.ssb echo " @@ -98,18 +98,19 @@ cat > ~/.zen/run-ssb-PUB_$EXTERNAL.sh < ~/.zen/ssb.pid.bash while true; do - ssb-server start --host $EXTERNAL 2>/tmp/ssb.debug # PROD=/dev/null + ssb-server start --host $EXTERNAL 2>/tmp/ssb.debug echo _! > ~/.zen/ssb.pid done EOF -[[ $1 == "PROD" ]] && sed -i s/tmp\/ssb.debug/dev\/null/g ~/.zen/run-ssb-PUB_$EXTERNAL.sh +[[ $1 == "PROD" ]] && sed -i s/tmp/dev/g ~/.zen/run-ssb-PUB_$EXTERNAL.sh && sed -i sed -i s/ssb\.debug/null/g ~/.zen/run-ssb-PUB_$EXTERNAL.sh # PROD=/dev/null sed -i s/_/\$/g ~/.zen/run-ssb-PUB_$EXTERNAL.sh chmod 755 ~/.zen/run-ssb-PUB_$EXTERNAL.sh ~/.zen/run-ssb-PUB_$EXTERNAL.sh & sleep 5 +[[ -f ~/.ssb/secret.dunikey ]] && cp ~/.ssb/secret.dunikey ~/.ssb/secret.dunikey.$(date -u +%s%N | cut -b1-13) ssbpub=$(sbotc whoami 2>/dev/null | jq -r .id) fi