This commit is contained in:
qo-op 2020-05-11 03:40:27 +02:00
parent be80c21c49
commit 1bac240fae
2 changed files with 11 additions and 10 deletions

View File

@ -9,6 +9,10 @@
MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
IPFSNODEID=$(ipfs id -f='<id>\n')
NANODATE=$(date -u +%s%N) #1569692075385428020
## IS IT A SMS NODE (gammu-smsd is installed)??
if [[ $(which gammu-smsd) ]]; then
[[ ! $MASTERPHONE ]] && echo "MISSING MASTERPHONE run from init.sh" && exit 1
@ -20,9 +24,6 @@ fi
NODE_G1PUBKEY=$(cat ~/.ssb/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2)
[[ $NODE_G1PUBKEY == "" ]] && echo "ERROR NODE_G1PUBKEY empty !! Please INIT SSB LAYER..." && exit 1
YOU=$(ps auxf --sort=+utime | grep -w ipfs | grep -v -E 'color=auto|grep' | tail -n 1 | cut -d " " -f 1);
IPFSNODEID=$(ipfs id -f='<id>\n')
NANODATE=$(date -u +%s%N) #1569692075385428020
echo "
$NANODATE
@ -151,14 +152,15 @@ if [[ -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_nanodate ]]; then
fi
################################################################
#INFORM ABOUT NODE CAPACITIES
export NODEPUB=$(cat "~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.pubkey")
# PRINTER CAPACITIES ??
## IS THERE USB PRINTER CONNECTED?
if [[ -e "/dev/usb/lp0" ]]; then
log "G1CORE: IMPRESSION G1Tag ACTIF .............."
PRINT=true
# echo $ADRESSE > "~/.zen/ipfs/.$IPFSNODEID/G1SSB/_where"
export PRINT=true
echo "$ADRESSE" > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_where
else
rm -f ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_where
fi
echo '
@ -167,7 +169,6 @@ echo '
\__ \| | /| / / /| | / /_/ / /|_/ / / / __ /
___/ /| |/ |/ / ___ |/ _, _/ / / / / / /_/ /
/____/ |__/|__/_/ |_/_/ |_/_/ /_/ /_/\__,_/
loaded
'
ls -a ~/.zen/ipfs/.$IPFSNODEID/G1SSB/
cat ~/.zen/secret.astroport.key

View File

@ -39,7 +39,7 @@ if [[ "$MEMBERUID" == "DON" || "$MEMBERUID" == "" || "$MEMBERUID" == "$MEMBER" ]
duniter_server=$(./tools/duniter_getnode.sh)
PAY=$(silkaj -p "$duniter_server" -af --file ~/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$MEMRIB" --amount "$GETLIMIT" --comment "[G1sms+] Wallet DESTROY $MEMBER $MEMBERUID" -y)
sleep 5
back=$(silkaj -p "$duniter_server" -af --file ~/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODEPUB" --amount "$LIMIT" --comment "[G1sms+] Wallet DESTROY Send $LIMIT To NODE" -y)
back=$(silkaj -p "$duniter_server" -af --file ~/.zen/g1sms_wallets/$PHONE/secret.dunikey tx --output "$NODE_G1PUBKEY" --amount "$LIMIT" --comment "[G1sms+] Wallet DESTROY Send $LIMIT To NODE" -y)
# TODO DEBUG :: echo $PAY
if [[ "$(echo $PAY | grep 'successful')" != "" && "$PAY" != "" && "$(echo $back | grep 'successful')" != "" ]]; then