diff --git a/g1sms/functions.sh b/g1sms/functions.sh index efe7ea6..4744169 100755 --- a/g1sms/functions.sh +++ b/g1sms/functions.sh @@ -217,7 +217,7 @@ do silkajExitCode=$? ((myi++)) - [ $i -gt 4 ] && break + [ $myi -gt 4 ] && break done if [[ $silkajOutput =~ $silkajQuantitativeAmountPattern ]] diff --git a/g1sms/sms_AUTH.sh b/g1sms/sms_AUTH.sh index ace4f03..36d0724 100755 --- a/g1sms/sms_AUTH.sh +++ b/g1sms/sms_AUTH.sh @@ -49,6 +49,9 @@ Insuffisant (minimum $VIR G1 + $LIMIT G1)" sms_ERROR "$PHONE" "$text" echo "Minimum $VIR G1 + $LIMIT G1" fi + +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE + log "__SUB:sms_AUTH.sh: END sms_AUTH.sh " log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" diff --git a/g1sms/sms_BILLETCHK.sh b/g1sms/sms_BILLETCHK.sh index eb72e8d..07f687d 100755 --- a/g1sms/sms_BILLETCHK.sh +++ b/g1sms/sms_BILLETCHK.sh @@ -82,5 +82,7 @@ else sms_SEND "$PHONE" "BILLET \"$CODE\" INCONNU !!" fi +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE + log "END sms_BILLETCHK.sh" log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" diff --git a/g1sms/sms_COUNT.sh b/g1sms/sms_COUNT.sh index 82da8cf..ffb44e1 100755 --- a/g1sms/sms_COUNT.sh +++ b/g1sms/sms_COUNT.sh @@ -71,6 +71,8 @@ else echo $AMOUNTG1 fi +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE + log "END sms_COUNT.sh" log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" exit diff --git a/g1sms/sms_EMAIL.sh b/g1sms/sms_EMAIL.sh index 9633372..107864f 100755 --- a/g1sms/sms_EMAIL.sh +++ b/g1sms/sms_EMAIL.sh @@ -50,7 +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 +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE log "END sms_EMAIL.sh" log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" diff --git a/g1sms/sms_NEW.sh b/g1sms/sms_NEW.sh index 8b10ba3..1de7781 100755 --- a/g1sms/sms_NEW.sh +++ b/g1sms/sms_NEW.sh @@ -44,7 +44,7 @@ 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 +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$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_PAY.sh b/g1sms/sms_PAY.sh index f3e669f..9000a45 100755 --- a/g1sms/sms_PAY.sh +++ b/g1sms/sms_PAY.sh @@ -85,6 +85,8 @@ Envoyez D pour (D)étail. A pour (A)ide..." sms_SEND "$PHONEDEST" "$mess_dest" +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONEDEST ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONEDEST +[[ -f /home/$YOU/.zen/g1sms_wallets/$phone ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone log "__SUB:sms_PAY.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~ " exit diff --git a/g1sms/sms_REC.sh b/g1sms/sms_REC.sh index c399106..c23bcc1 100755 --- a/g1sms/sms_REC.sh +++ b/g1sms/sms_REC.sh @@ -159,7 +159,7 @@ $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 +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE else log "__SUB:sms_REC.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND" diff --git a/g1sms/sms_SETUNIT.sh b/g1sms/sms_SETUNIT.sh index 072b01a..49ffb0d 100755 --- a/g1sms/sms_SETUNIT.sh +++ b/g1sms/sms_SETUNIT.sh @@ -36,7 +36,7 @@ Unité de votre portefeuille: $unit" sms_SEND "$phone" "$mess" -[[ -f ~/.zen/g1sms_wallets/$phone ]] && chown -R $YOU ~/.zen/g1sms_wallets/$phone +[[ -f /home/$YOU/.zen/g1sms_wallets/$phone ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$phone log "END sms_SETUNIT.sh" log "~~~~~~~~~~~~~~~~~~~~~~~~~~~~" diff --git a/g1sms/sms_VIR.sh b/g1sms/sms_VIR.sh index b860083..8e9c3db 100755 --- a/g1sms/sms_VIR.sh +++ b/g1sms/sms_VIR.sh @@ -92,7 +92,7 @@ $PAY" sms_SEND "$ADMINPHONE" "$PAY"; fi -[[ -f ~/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU ~/.zen/g1sms_wallets/$PHONE +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE else log "__SUB:sms_VIR.sh: ERROR $MEMBER: $DESTMEM DESTRIB NOT FOUND" diff --git a/g1sms/sms_WHERE.sh b/g1sms/sms_WHERE.sh index 8664503..f4e3c84 100755 --- a/g1sms/sms_WHERE.sh +++ b/g1sms/sms_WHERE.sh @@ -49,6 +49,8 @@ $(cat /home/$YOU/.zen/ipfs_swarm/.$ipfsnodeid/G1SSB/_where)" sms_SEND "$PHONE" "$mess" +[[ -f /home/$YOU/.zen/g1sms_wallets/$PHONE ]] && chown -R $YOU /home/$YOU/.zen/g1sms_wallets/$PHONE + log "__SUB:sms_WHERE.sh: END ~~~~~~~~~~~~~~~~~~~~~~~~~~~~" exit