diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh index d58a911..6b525ca 100755 --- a/.install/scuttlebutt.sh +++ b/.install/scuttlebutt.sh @@ -18,11 +18,11 @@ scuttlebutt() { export NVM_DIR="$HOME/.nvm" nvm install --lts fi - # Install ssb-server and config in ~/.ssb_astroport - [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport - cd ~/.ssb_astroport - ### Install module in ~/.ssb_astroport/node_modules + mkdir -p ~/.ssb + cd ~/.ssb + + ### Install module npm install sodium-native ssb-backlinks ssb-ws ssb-links ssb-query ssb-secret-blob ssb-private npm install -g ssb-server @@ -31,7 +31,8 @@ scuttlebutt() { ### Install oasis & ssb-cli (could replace ssb-server?? TODO: try it) npm -g install fraction/oasis#semver: - npm -g install ssb-cli@latest + npm install -g fraction/ssb-daemon + npm install -g ssb-cli # INSTALL sbotc if [[ ! $(which sbotc) ]]; then diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh index 2cb378c..8f7ff96 100755 --- a/zen/tools/make_G1SSB_secret.sh +++ b/zen/tools/make_G1SSB_secret.sh @@ -12,6 +12,7 @@ echo ' # Make a G1SSB Account ######################################################################## ' +mkdir -p ~/.zen # INSTALL Silkaj, CLI for Duniter if [[ ! $(which silkaj) ]]; then @@ -22,7 +23,6 @@ __) _|_ |_ |\ /--\ \_| #Libre Money Layer ' - mkdir -p ~/.zen sudo apt update || true libzzz=$(sudo apt-cache search libsodium | awk '{print $1}' | grep libsodium2) sudo apt install build-essential jq $libzzz -y @@ -45,7 +45,7 @@ fi if [[ -d ~/.ssb ]]; then echo "ScuttleButt is already installed...??" - echo "Do you want to create a new ~/.ssb identity ? (y)/n" + echo "Do you want to create a new ~/.ssb identity (will backup current one) ? (y)/n" read isitok if [[ "$isitok" == "y" ]]; then @@ -55,25 +55,26 @@ if [[ -d ~/.ssb ]]; then # If exists backup ~/.ssb to ~/.ssb_$USER SSB (one time only !) [[ -d ~/.ssb_$USER ]] && echo "BACKUP already existing... ~/.ssb_$USER !!! Manual check please..." && exit 1 - [[ $ssbSERVER == "" ]] && echo "Check your ssb-server install... Cannot find it !!" && exit 1 \ - || kill -9 $(ps auxf --sort=+utime | grep -w ssb-server| grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') +# [[ $ssbSERVER == "" ]] && echo "Check your ssb-server install... Cannot find it !!" && exit 1 \ +# || kill -9 $(ps auxf --sort=+utime | grep -w ssb-server| grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}') [[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER # CREATE ~/.ssb_astroport - [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport && cd ~/.ssb_astroport + [[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport # Symlink ~/.ssb -> ~/.ssb_astroport [[ -L ~/.ssb ]] && rm ~/.ssb [[ -d ~/.ssb_astroport ]] && ln -s ~/.ssb_astroport ~/.ssb else - echo "You must remove '~/.ssb' before running $ME"; + echo "You must remove old '~/.ssb' before running $ME"; exit 1; fi fi -mkdir -p ~/.ssb +cd ~/.ssb/ + echo "WELCOME CREATING YOUR G1 SSB ACCOUNT !!!" echo ' __ __ __ _ @@ -96,12 +97,14 @@ passphrase generator...' # LOGIN (=SALT) 6 WORDS salt="$($MY_PATH/diceware.sh 6)" # PASS (=PEPPER) 3 WORDS - pepper="$($MY_PATH/diceware.sh 3)" + pepper="$($MY_PATH/diceware.sh 4)" echo "........." - echo "REMEMBER YOUR CREDENTIALS !!! -login (salt) : $salt -password : $pepper" + echo "SECRET CREDENTIALS !!! https://cesium.app & https://gchange.fr +ID:$salt +PWD:$pepper" > ~/.zen/secret.ZEN.txt + +cat ~/.zen/secret.ZEN.txt fi @@ -111,6 +114,8 @@ python3 $MY_PATH/key_create_dunikey.py "$salt" "$pepper" # CREATE SSB secret g1pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2) +echo "G1:$g1pub" >> ~/.zen/secret.ZEN.txt + g1priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2) ssbpub=$(echo $g1pub | base58 -d | base64) ssbpriv=$(echo $g1priv | base58 -d | base64) @@ -134,6 +139,8 @@ cat > ~/.ssb/secret <> ~/.zen/secret.ZEN.txt + echo " _ |__|_ \ / _ o | _.