mieux
This commit is contained in:
parent
ddfb39274b
commit
07e992474d
|
@ -43,34 +43,27 @@ if [[ ! $(which sbotc) ]]; then
|
||||||
cd $MY_PATH
|
cd $MY_PATH
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -d ~/.ssb ]]; then
|
echo "Do you want to create a new ~/.ssb identity (will backup current one) ? (y)/n"
|
||||||
echo "ScuttleButt is already installed...??"
|
read isitok
|
||||||
echo "Do you want to create a new ~/.ssb identity (will backup current one) ? (y)/n"
|
if [[ "$isitok" == "y" ]]; then
|
||||||
read isitok
|
|
||||||
if [[ "$isitok" == "y" ]]; then
|
|
||||||
|
|
||||||
# TEST ssb-server Install
|
# TEST ssb-server Install
|
||||||
ssbSERVER=$(which ssb-server)
|
ssbSERVER=$(which ssb-server)
|
||||||
|
|
||||||
# If exists backup ~/.ssb to ~/.ssb_$USER SSB (one time only !)
|
# 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_$USER ]] && echo "BACKUP already existing... ~/.ssb_$USER !!! Manual check please..." && exit 1
|
||||||
|
[[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER
|
||||||
|
|
||||||
# [[ $ssbSERVER == "" ]] && echo "Check your ssb-server install... Cannot find it !!" && exit 1 \
|
# CREATE ~/.ssb_astroport
|
||||||
# || kill -9 $(ps auxf --sort=+utime | grep -w ssb-server| grep -v -E 'color=auto|grep' | tail -n 1 | awk '{print $2}')
|
[[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport
|
||||||
|
|
||||||
[[ -d ~/.ssb ]] && [[ ! -d ~/.ssb_$USER ]] && mv ~/.ssb ~/.ssb_$USER
|
# Symlink ~/.ssb -> ~/.ssb_astroport
|
||||||
|
[[ -L ~/.ssb ]] && rm ~/.ssb
|
||||||
# CREATE ~/.ssb_astroport
|
[[ -d ~/.ssb_astroport ]] && ln -s ~/.ssb_astroport ~/.ssb
|
||||||
[[ ! -d ~/.ssb_astroport ]] && mkdir -p ~/.ssb_astroport
|
|
||||||
|
|
||||||
# Symlink ~/.ssb -> ~/.ssb_astroport
|
|
||||||
[[ -L ~/.ssb ]] && rm ~/.ssb
|
|
||||||
[[ -d ~/.ssb_astroport ]] && ln -s ~/.ssb_astroport ~/.ssb
|
|
||||||
|
|
||||||
else
|
else
|
||||||
echo "You must remove old '~/.ssb' before running $ME";
|
echo "You must remove old '~/.ssb' before running $ME";
|
||||||
exit 1;
|
exit 1;
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cd ~/.ssb/
|
cd ~/.ssb/
|
||||||
|
@ -111,7 +104,7 @@ fi
|
||||||
# CREATE ~/.ssb/secret.dunikey
|
# CREATE ~/.ssb/secret.dunikey
|
||||||
python3 $MY_PATH/key_create_dunikey.py "$salt" "$pepper"
|
python3 $MY_PATH/key_create_dunikey.py "$salt" "$pepper"
|
||||||
sleep 2
|
sleep 2
|
||||||
[[ -f /tmp/secret.dunikey ]] && mv /tmp/secret.dunikey ~/.ssb/ || exit 1
|
[[ -f /tmp/secret.dunikey ]] && mv /tmp/secret.dunikey ~/.ssb/secret.dunikey || exit 1
|
||||||
|
|
||||||
# CREATE SSB secret
|
# CREATE SSB secret
|
||||||
g1pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
|
g1pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
|
||||||
|
|
Loading…
Reference in New Issue