diff --git a/zen/tools/make_G1SSB_secret.sh b/zen/tools/make_G1SSB_secret.sh index dcb9d74..76a3cee 100755 --- a/zen/tools/make_G1SSB_secret.sh +++ b/zen/tools/make_G1SSB_secret.sh @@ -47,25 +47,20 @@ echo "Do you want to create a new ~/.ssb identity (will backup current one) ? (y read isitok if [[ "$isitok" == "y" ]]; then - # TEST ssb-server Install - ssbSERVER=$(which ssb-server) +# TEST ssb-server Install +ssbSERVER=$(which ssb-server) - # 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 - [[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER +# 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 +[[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER - # CREATE ~/.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 old '~/.ssb' before running $ME"; - exit 1; -fi +# CREATE ~/.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 + cd ~/.ssb/ echo "WELCOME CREATING YOUR G1 SSB ACCOUNT !!!" @@ -86,14 +81,14 @@ if [[ "$salt" == "" && "$pepper" == "" ]]; then passphrase generator...' - # GENERATE MNEMONIC KEY: 9 MOTS - # LOGIN (=SALT) 6 WORDS - salt="$($MY_PATH/diceware.sh 6)" - # PASS (=PEPPER) 3 WORDS - pepper="$($MY_PATH/diceware.sh 4)" +# GENERATE MNEMONIC KEY: 9 MOTS +# LOGIN (=SALT) 6 WORDS +salt="$($MY_PATH/diceware.sh 6)" +# PASS (=PEPPER) 4 WORDS +pepper="$($MY_PATH/diceware.sh 4)" - echo "........." - echo "SECRET CREDENTIALS !!! https://cesium.app & https://gchange.fr +echo "........." +echo "SECRET CREDENTIALS !!! https://cesium.app & https://gchange.fr ID:$salt PWD:$pepper" > ~/.zen/secret.ZEN.txt @@ -103,7 +98,7 @@ fi # CREATE ~/.ssb/secret.dunikey python3 $MY_PATH/key_create_dunikey.py "$salt" "$pepper" -sleep 2 +sleep 1 [[ -f /tmp/secret.dunikey ]] && mv /tmp/secret.dunikey ~/.ssb/secret.dunikey || exit 1 # CREATE SSB secret @@ -149,12 +144,13 @@ Install Patchwork : https://github.com/ssbc/patchwork/releases/ Use your credential with https://cesium.app login (salt) : $salt password : $pepper -" - -# INITIALISE manifest -[[ $ssbSERVER ]] && [[ ! -f ~/.ssb/manifest.json ]] && printf '{"manifest":"sync"}' > ~/.ssb/manifest.json -[[ $ssbSERVER ]] && ssb-server start & -[[ $ssbSERVER ]] && [[ ! -f ~/.ssb/manifest.json ]] && sbotc -t async manifest > ~/.ssb/manifest.json - +" + + + +else + echo "You must remove old '~/.ssb' before running $ME"; + exit 1; +fi exit 0