From d01d4a705fbc754f363e37d93932614311302fbd Mon Sep 17 00:00:00 2001 From: qo-op Date: Fri, 22 Jan 2021 15:04:14 +0100 Subject: [PATCH] arrrg bug was introduced --- shell/cron_CODE.backup.sh | 4 ++-- shell/init_keys.sh | 4 ++-- shell/sms_BILLETCHK.sh | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/shell/cron_CODE.backup.sh b/shell/cron_CODE.backup.sh index a62825c..158406b 100755 --- a/shell/cron_CODE.backup.sh +++ b/shell/cron_CODE.backup.sh @@ -5,8 +5,8 @@ # License: AGPL-3.0 (https://choosealicense.com/licenses/agpl-3.0/) # BACKUP G1sms+ current Devlt code and push it with SWARM_CODE_MASTER to IPFS ################################################################################ -source ./shell/init.sh -source ./shell/functions.sh +source ./init.sh +source ./functions.sh now=$(date +%Y-%m-%d) MY_PATH="`dirname \"$0\"`" # relative diff --git a/shell/init_keys.sh b/shell/init_keys.sh index 35127e1..47d31b7 100755 --- a/shell/init_keys.sh +++ b/shell/init_keys.sh @@ -23,8 +23,8 @@ export GPGPASS=$(cat "/home/$YOU/.ipfs/config" | jq '.Identity.PrivKey' | sed s/ if [ ! $GPGPASS ]; then echo "FATAL ERROR:: IPFS Node.Identity.PrivKey GPGPASS EMPTY"; exit; fi # GET SWARM KEY G1sms+ .ipfs/swarm.key -export SWARMKEY=$(cat "/home/$YOU/.ipfs/swarm.key" | tail -n 1) -if [ ! $SWARMKEY ]; then echo "FATAL ERROR:: .ipfs/swarm.key EMPTY"; exit; fi +#export SWARMKEY=$(cat "/home/$YOU/.ipfs/swarm.key" | tail -n 1) +#if [ ! $SWARMKEY ]; then echo "FATAL ERROR:: .ipfs/swarm.key EMPTY"; exit; fi ################################################################## # G1sms+ Swarm KEYS diff --git a/shell/sms_BILLETCHK.sh b/shell/sms_BILLETCHK.sh index b0e0c1d..0f1b85e 100755 --- a/shell/sms_BILLETCHK.sh +++ b/shell/sms_BILLETCHK.sh @@ -21,7 +21,7 @@ then UNIT=$(cat "./billets/$bpath/note.unit") BILLETPUBKEY=$(cat "./billets/$bpath/note.pubkey") - AMOUNTG1=$(./silkaj/silkaj amount "$BILLETPUBKEY") + AMOUNTG1=$(./silkaj/silkaj -p g1.presles.fr:443 amount "$BILLETPUBKEY") log "Billet: $AMOUNTG1 ($VALbillet $UNIT): $BILLETPUBKEY" # NO GOOD SECRET @@ -41,8 +41,8 @@ https://www.g1sms.fr/contact" # Account creation sms_INIT_ACCOUNT "$PHONE" fi - log "./silkaj/silkaj transaction --auth-scrypt -salt=\"$CODE\" -password=\"$SEC$SALT\" --amount=\"$AMOUNTG1\" --output=\"$PUBKEY\" --comment=\"THIRD_PARTY_MANAGER:$NODE_G1PUBKEY:G1SMS:ENCAISSEMENT:$CODE\" -y" - PAY=$(./silkaj/silkaj transaction --auth-scrypt -salt="$CODE" -password="$SEC$SALT" --amount="$AMOUNTG1" --output="$PUBKEY" --comment="THIRD_PARTY_MANAGER:$NODE_G1PUBKEY:ENCAISSEMENT:$CODE" -y) + log "./silkaj/silkaj transaction -p g1.presles.fr:443 --auth-scrypt -salt=\"$CODE\" -password=\"$SEC$SALT\" --amount=\"$AMOUNTG1\" --output=\"$PUBKEY\" --comment=\"THIRD_PARTY_MANAGER:$NODE_G1PUBKEY:G1SMS:ENCAISSEMENT:$CODE\" -y" + PAY=$(./silkaj/silkaj transaction -p g1.presles.fr:443 --auth-scrypt -salt="$CODE" -password="$SEC$SALT" --amount="$AMOUNTG1" --output="$PUBKEY" --comment="THIRD_PARTY_MANAGER:$NODE_G1PUBKEY:ENCAISSEMENT:$CODE" -y) if [[ "$(echo $PAY | cut -d '|' -f 1)" != "KO" ]]; then # DESTROY BILLET