From b4d15e953de75c5e2f12fd7c693eb8319f93ea49 Mon Sep 17 00:00:00 2001
From: Boris Paing <boris.paing@laposte.net>
Date: Sat, 14 Mar 2020 22:59:58 +0100
Subject: [PATCH 1/2] Authors

---
 readme.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/readme.md b/readme.md
index f7310af..847f9b2 100644
--- a/readme.md
+++ b/readme.md
@@ -9,9 +9,9 @@ SSB/Ğ1 like
 
 ## Authors
 
-- @cel from the SSB community (`@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519`)
-- @Fred from the Ğ1 community (`@9BbJwPDjcyIqrOUPNn0nJZBduWdIrpMk3Cjz5MP361s=.ed25519`)
-- @Boris from the Ğ1 community (`@l5nYExWYIgDLV6BYHOJPoI97jIUyTdSm8CTLpQ0XeOg=.ed25519`)
+- **cel** from the SSB community (`@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519`)
+- **Fred** from the Ğ1 community (`@9BbJwPDjcyIqrOUPNn0nJZBduWdIrpMk3Cjz5MP361s=.ed25519`)
+- **Boris** from the Ğ1 community (`@l5nYExWYIgDLV6BYHOJPoI97jIUyTdSm8CTLpQ0XeOg=.ed25519`)
 
 ## What is a libre currency?
 

From dffa13b9d4a55f80b71cb9fa56c159a5a5ec7398 Mon Sep 17 00:00:00 2001
From: Boris Paing <boris.paing@laposte.net>
Date: Sat, 14 Mar 2020 23:22:27 +0100
Subject: [PATCH 2/2] Cargo and DUP-Mnemonic not needed if SSB secret already
 exists

---
 install.sh                  |  74 ++++++++++----------
 process-likes-g1-install.sh | 133 ------------------------------------
 2 files changed, 39 insertions(+), 168 deletions(-)
 delete mode 100644 process-likes-g1-install.sh

diff --git a/install.sh b/install.sh
index adf83e4..ce3425f 100755
--- a/install.sh
+++ b/install.sh
@@ -16,14 +16,7 @@
 # INSTALL requirements
 [[ ! $(which base58) ]] && sudo apt install build-essential base58 -y
 
-# INSTALL Cargo
-if [[ ! $(which cargo) ]]; then
-	curl https://sh.rustup.rs -sSf | sh
-	PATH=$PATH:~/.cargo/env
-	source $HOME/.cargo/env
-fi
-
-# INSTALL silkaj
+# INSTALL Silkaj, CLI for Duniter
 if [[ ! $(which silkaj) ]]; then
 	echo "INSTALL silkaj"
 	sudo apt update || true
@@ -45,6 +38,41 @@ fi
 ####################### G1 SSB ACCOUNT MANAGER ############################################
 ###########################################################################################
 
+
+
+# If user already has an SSB account, we generate Duniter secret key from SSB secret key
+if [[ -f ~/.ssb/secret ]]; then
+
+ssbpub=$(cat ~/.ssb/secret | grep public\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
+ssbpriv=$(cat ~/.ssb/secret | grep private\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
+g1pub=$(echo $ssbpub | base64 -d | base58)
+g1priv=$(echo $ssbpriv | base64 -d | base58)
+
+cat > ~/.ssb/secret.dunikey <<EOF
+Type: PubSec
+Version: 1
+pub: $g1pub
+sec: $g1priv
+EOF
+
+
+# If user doesn't have an SSB account, we create one
+else 
+
+
+mkdir -p ~/.ssb
+echo "WELCOME CREATING YOUR G1 SSB ACCOUNT !!!"
+echo "CHOOSE YOU LOGIN or LEAVE BLANK & HIT ENTER FOR AUTO GENERATION"
+read salt
+[[ $salt != "" ]] && echo "PASSWORD?" && read pepper && [[ $pepper == "" ]] && exit
+
+# INSTALL Cargo
+if [[ ! $(which cargo) ]]; then
+	curl https://sh.rustup.rs -sSf | sh
+	PATH=$PATH:~/.cargo/env
+	source $HOME/.cargo/env
+fi
+
 # Install DUP-Mnemonic
 
 if [[ ! $(which dup-mnemonic) ]]; then
@@ -55,15 +83,6 @@ if [[ ! $(which dup-mnemonic) ]]; then
 	sudo cp target/release/dup-mnemonic /usr/local/bin
 fi
 
-# CHECK SSB ~/.ssb/secret
-if [[ ! -f ~/.ssb/secret ]]; then
-mkdir -p ~/.ssb
-echo "WELCOME CREATING YOUR G1 SSB ACCOUNT !!!"
-echo "CHOOSE YOU LOGIN or LEAVE BLANK & HIT ENTER FOR AUTO GENERATION"
-read salt
-[[ $salt != "" ]] && echo "PASSWORD?" && read pepper && [[ $pepper == "" ]] && exit
-
-
 # GENERATE MNEMONIC KEY: 9 MOTS
 if [[ $salt == "" ]]; then
 	declare -a makeyarray
@@ -80,7 +99,7 @@ echo "CREDENTIAL: $salt / $pepper"
 python3 ./key_create_dunikey.py "$salt" "$pepper"
 mv ./.secret.dunikey ~/.ssb/secret.dunikey
 
-# CREATE  
+# CREATE SSB secret
 pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
 priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2)
 ssbpub=$(echo $pub | base58 -d | base64)
@@ -105,23 +124,6 @@ cat > ~/.ssb/secret <<EOF
 EOF
 
 
-else
-
-
-
-# CREATE ~/.ssb/secret.dunikey
-ssbpub=$(cat ~/.ssb/secret | grep public\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
-ssbpriv=$(cat ~/.ssb/secret | grep private\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
-g1pub=$(echo $ssbpub | base64 -d | base58)
-g1priv=$(echo $ssbpriv | base64 -d | base58)
-
-cat > ~/.ssb/secret.dunikey <<EOF
-Type: PubSec
-Version: 1
-pub: $g1pub
-sec: $g1priv
-EOF
-
 fi
 
 
@@ -129,3 +131,5 @@ echo -e "Installation complete"
 
 
 exit 0
+
+
diff --git a/process-likes-g1-install.sh b/process-likes-g1-install.sh
deleted file mode 100644
index a37ace0..0000000
--- a/process-likes-g1-install.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/bash
-################################################################################
-# Authors:
-# [@cel](@f/6sQ6d2CMxRUhLpspgGIulDxDCwYD7DzFzPNr7u5AU=.ed25519)
-# [@Fred](@9BbJwPDjcyIqrOUPNn0nJZBduWdIrpMk3Cjz5MP361s=.ed25519)
-# [@Boris](@l5nYExWYIgDLV6BYHOJPoI97jIUyTdSm8CTLpQ0XeOg=.ed25519)
-# Version: 1.0
-# License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/)
-###########################################################################################
-# ADD G1 Layer 10 LOVE to message writer you like !
-# INSTALL silkaj sbotc
-# PREVENT DOUBLE PAYEMENT
-############################################################################################ 
-
-fn_exists() {
-  # appended double quote is an ugly trick to make sure we do get a string -- if $1 is not a known command, type does not output anything
-  [ `type -t $1`"" == 'file' ]
-}
-
-# INSTALL silkaj
-if ! fn_exists silkaj; then
-echo "INSTALL silkaj"
-sudo apt-get update -y || true
-sudo apt install python3-pip python3-setuptools python3-wheel -y && pip3 install silkaj --user
-echo 'PATH=$PATH:.local/bin' >> ~/.bashrc && source ~/.bashrc
-fi
-
-
-# INSTALL build-essential
-
-if ! dpkg -s build-essential; then
-	sudo apt install build-essential -y
-fi
-
-# INSTALL sbotc
-if ! fn_exists sbotc; then
-sudo apt install libsodium-dev jq -y
-git clone https://git.scuttlebot.io/%25133ulDgs%2FoC1DXjoK04vDFy6DgVBB%2FZok15YJmuhD5Q%3D.sha256 sbotc
-cd sbotc
-make
-sudo make install
-fi
-
-
-###########################################################################################
-####################### G1 SSB ACCOUNT MANAGER ############################################
-###########################################################################################
-
-
-
-# If user already has an SSB account, we generate Duniter secret key from SSB secret key
-if [[ -f ~/.ssb/secret ]]; then
-
-
-ssbpub=$(cat ~/.ssb/secret | grep public\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
-ssbpriv=$(cat ~/.ssb/secret | grep private\" | cut -d ' ' -f 4 | cut -d '.' -f 1 | sed s/\"//g)
-g1pub=$(echo $ssbpub | base64 -d | base58)
-g1priv=$(echo $ssbpriv | base64 -d | base58)
-
-cat > ~/.ssb/secret.dunikey <<EOF
-Type: PubSec
-Version: 1
-pub: $g1pub
-sec: $g1priv
-EOF
-
-
-
-
-# If user doesn't have an SSB account, we create one
-else
-
-
-
-
-mkdir -p ~/.ssb
-echo "WELCOME CREATING YOUR G1 SSB ACCOUNT !!!"
-echo "CHOOSE YOU LOGIN or LEAVE BLANK & HIT ENTER FOR AUTO GENERATION"
-read salt
-[[ $salt != "" ]] && echo "PASSWORD?" && read pepper && [[ $pepper == "" ]] && exit
-
-# Install DUP-Mnemonic
-
-if ! fn_exists dup-mnemonic; then
-	cd /tmp
-	git clone https://git.duniter.org/tools/dup-mnemonic-rs
-	cd dup-mnemonic-rs
-	cargo build --release
-	sudo cp target/release/dup-mnemonic /usr/local/bin
-fi
-
-# GENERATE MNEMONIC KEY: 9 MOTS
-if [[ $salt == "" ]]; then
-	declare -a makeyarray
-	makeyarray=($(dup-mnemonic -l $lang))
-	# LOGIN (=SALT) 6 MOTS
-	salt="${makeyarray[0]} ${makeyarray[1]} ${makeyarray[2]} ${makeyarray[3]} ${makeyarray[4]} ${makeyarray[5]}"
-	# PASS (=PEPPER) 3 MOTS
-	pepper="${makeyarray[6]} ${makeyarray[7]} ${makeyarray[8]}"
-fi
-echo "........."
-echo "CREDENTIAL: $salt / $pepper"
-
-# CREATE ~/.ssb/secret.dunikey
-python3 ./key_create_dunikey.py "$salt" "$pepper"
-mv ./.secret.dunikey ~/.ssb/secret.dunikey
-
-# CREATE SSB secret
-pub=$(cat ~/.ssb/secret.dunikey | grep "pub" | cut -d ' ' -f 2)
-priv=$(cat ~/.ssb/secret.dunikey | grep "sec" | cut -d ' ' -f 2)
-ssbpub=$(echo $pub | base58 -d | base64)
-ssbpriv=$(echo $priv | base58 -d | base64)
-cat > ~/.ssb/secret <<EOF
-# This secret is related to your G1Wallet - https://cesium.app
-# silkaj balance $pub
-# ID (salt): $salt / Pass: $pepper
-# THIS KEY IS YOURS! REMIND IT AND KEEP IT SAFE AS A REAL WALLET
-# chmod 400 ~/.zen/secret
-
-{
-  "curve": "ed25519",
-  "public": "$ssbpub.ed25519",
-  "private": "$ssbpriv.ed25519",
-  "id": "@$ssbpub.ed25519"
-}
-
-# WARNING! It's vital that you DO NOT edit OR share your secret name
-# instead, share your public name
-# your SSB public name: @$ssbpub.ed25519
-EOF
-
-
-fi
\ No newline at end of file