axiom-team
/
astroport
9
3
Fork 1
Code Issues 13 Pull Requests 1 Releases Wiki Activity

now, g1sms wallet name can be choosen with "N pseudo" (if pseudo is not G1member)

This commit is contained in:
qo-op 2020-09-15 22:42:13 +02:00
parent 75ec620ad3
commit 896ff9032b
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
g1sms/functions.sh
View File

@ -264,7 +264,7 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
# (NO PIN) = FIRST ACCOUNT: Create wallet
if [ ! -f "$PINFILE" ]; then
# NOSMS mode?
if [[ $2 == "NOSMS" ]]; then UNKNOWN="unknown"; return; fi
if [[ "$2" == "NOSMS" && "$3" == "" ]]; then UNKNOWN="unknown"; return; fi
mkdir -p /home/$YOU/.zen/g1sms/$PHONE/
#######################
@ -278,6 +278,8 @@ log "__SUB:sms_INIT_ACCOUNT: ($1=phone, $2=NOSMS)"
while [[ $(grep -Rwl "$UIDNA$TAIL" /home/$YOU/.zen/ipfs_swarm/.*/G1SMS/_uidna 2>/dev/null) ]]; do
UIDNA=N1$(/home/$YOU/.zen/astroport/zen/tools/diceware.sh 1 | xargs); done
UIDNA="$UIDNA$TAIL"
# Choosen pseudo
[[ "$3" != "" ]] && UIDNA="$3"
echo "$UIDNA" > "$UIDNAFILE"
#######################

6
g1sms/sms_NEW.sh
View File

@ -22,11 +22,11 @@ if [[ "$MEMBERUID" != "" && "$MEMBERUID" != "N" && "$MEMBERUID" != "D" && "$MEMB
VIRDEST=$MEMBERUID
MEMRIB=$(sms_uid2key "$MEMBERUID" "$PHONE" "$PIN")
log "# MEMRIB: $MEMRIB"
[[ $MEMRIB == "" ]] && sms_SEND "$PHONE" "Nous rencontrons un problème pour trouver $MEMBERUID... Rééssayer dans 5 mn" && exit 1
MEMBER="$MEMBERUID"
[[ $MEMRIB != "" ]] && MEMBER="$MEMBERUID" && MEMBERUID=""
[[ $MEMRIB == "" ]] && sms_SEND "$PHONE" "Aucun membre: $MEMBERUID... Création simple portefeuille pour $MEMBERUID" && MEMBER=""
fi
sms_INIT_ACCOUNT "$PHONE" "NOSMS"
sms_INIT_ACCOUNT "$PHONE" "NOSMS" "$MEMBERUID"
# Check account amount
countvalues=($(check_account))
log "$(declare -p countvalues)"