diff --git a/g1sms/sms_BILLET.sh b/g1sms/sms_BILLET.sh index 4be14ce..ab3752d 100755 --- a/g1sms/sms_BILLET.sh +++ b/g1sms/sms_BILLET.sh @@ -120,14 +120,14 @@ then # Transaction to create Link BILLET <-> MEMBER RIB => Decrease BILLET value ! sleep 2 - # PAY=$(./silkaj/silkaj transaction --auth-scrypt -salt="$NUMBER" -password="$SECRET" --amount="0.05" --output="$MEMRIB" --comment="THIRD_PARTY_MANAGER:$NODE_G1PUBKEY:G1SMS:BILLET:$VALbillet:$UNIT:$NUMBER" -y) + # PAY=$(silkaj transaction --auth-scrypt -salt="$NUMBER" -password="$SECRET" --amount="0.05" --output="$MEMRIB" --comment="THIRD_PARTY_MANAGER:$NODE_G1PUBKEY:G1SMS:BILLET:$VALbillet:$UNIT:$NUMBER" -y) else sms_ERROR "$PHONE" "Un problème est survenu. Contactez $ADMINPSEUDO au $ADMINPHONE" # Copy & Send produced files zip /tmp/$PHONE_Bills_$bpath.zip /home/$YOU/.zen/g1billets/MEMBERS/$MEMBER/*.* mpack -s "[G1sms+]_G1Billets ($bpath) Erreur... création G1Billets..." -d /tmp/message_body.txt /tmp/$PHONE_Bills_$bpath.zip $SMSEMAIL && mv /tmp/$PHONE_Bills_$bpath.zip /home/$YOU/.zen/g1billets/MEMBERS/$MEMBER/ && log "__SUB:sms_BILLET.sh: ALERT sent....." - log "__SUB:sms_BILLET.sh: ERROR SILKAJ $(cat ./silkaj/src/constants.py)" + log "__SUB:sms_BILLET.sh: ERROR SILKAJ" exit fi done diff --git a/g1sms/sms_EMAIL.sh b/g1sms/sms_EMAIL.sh index 4f270f6..9633372 100755 --- a/g1sms/sms_EMAIL.sh +++ b/g1sms/sms_EMAIL.sh @@ -50,6 +50,7 @@ Mettez le à jour, si cela est nécessaire..." sms_SEND "$phone" "$mess" +[[ -f ~/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU ~/.zen/g1sms_wallets/$PHONE log "END sms_EMAIL.sh" log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh index 4641787..8b10ba3 100755 --- a/g1sms/sms_NEW.sh +++ b/g1sms/sms_NEW.sh @@ -44,6 +44,8 @@ sms_SEND "$PHONE" "$PUBKEY" [[ $MEMRIB != "" ]] && sms_SEND "$PHONE" "Compte Atttaché: $MEMBER $SMSEMAIL $MEMRIB" +[[ -f ~/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU ~/.zen/g1sms_wallets/$PHONE + # Add contact to database add_contact $PHONE $MEMBERUID && log "${c_green}Contact has been added to database$c_" || log "${c_red}Contact can't be added to database$c_" diff --git a/g1sms/sms_REC.sh b/g1sms/sms_REC.sh index f9c540d..c399106 100755 --- a/g1sms/sms_REC.sh +++ b/g1sms/sms_REC.sh @@ -100,7 +100,7 @@ else # else ##################### REWRITE TODO # SEARCH WITH SILKAJ - DESTRIB=$(./silkaj/silkaj id "$DESTMEM" | grep -w "$DESTMEM" | awk '{print $2}') + DESTRIB=$(silkaj id "$DESTMEM" | grep -w "$DESTMEM" | awk '{print $2}') log "__SUB:sms_VIR.sh: OUT OFF SWARM MEMBER wallet: $DESTRIB" # fi fi @@ -159,6 +159,8 @@ $DESTRIB" sms_SEND "$DESTPHONE" "[G1sms+] Bonjour $DESTMEM. Vous recev(r)ez un payement de $VIR G1 (pendant $TIME $PERIOD) de la part du portefeuille: $MEMBER $UIDNA." fi +[[ -f ~/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU ~/.zen/g1sms_wallets/$PHONE + else log "__SUB:sms_REC.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND" mess="[G1sms+] Virement annulé... diff --git a/g1sms/sms_SETUNIT.sh b/g1sms/sms_SETUNIT.sh index c1d54a7..072b01a 100755 --- a/g1sms/sms_SETUNIT.sh +++ b/g1sms/sms_SETUNIT.sh @@ -36,6 +36,8 @@ Unité de votre portefeuille: $unit" sms_SEND "$phone" "$mess" +[[ -f ~/.zen/g1sms_wallets/$phone ]] && chown -R $YOU ~/.zen/g1sms_wallets/$phone + log "END sms_SETUNIT.sh" log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" diff --git a/g1sms/sms_VIR.sh b/g1sms/sms_VIR.sh index 0df565e..b860083 100755 --- a/g1sms/sms_VIR.sh +++ b/g1sms/sms_VIR.sh @@ -69,7 +69,7 @@ else # else ##################### REWRITE TODO # SEARCH WITH SILKAJ - DESTRIB=$(./silkaj/silkaj id "$DESTMEM" | grep -w "$DESTMEM" | awk '{print $2}') + DESTRIB=$(silkaj id "$DESTMEM" | grep -w "$DESTMEM" | awk '{print $2}') log "__SUB:sms_VIR.sh: OUT OFF SWARM MEMBER wallet: $DESTRIB" # fi fi @@ -91,6 +91,9 @@ $PAY" else sms_SEND "$ADMINPHONE" "$PAY"; fi + +[[ -f ~/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU ~/.zen/g1sms_wallets/$PHONE + else log "__SUB:sms_VIR.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND" mess="[G1sms+] Virement annulé...