diff --git a/zen/zen_MAKE.sh b/zen/zen_MAKE.sh index c50da9e..7d0cde9 100755 --- a/zen/zen_MAKE.sh +++ b/zen/zen_MAKE.sh @@ -90,7 +90,6 @@ echo " # | |_| | _ <| |___| |___| |\ | / / __/ | | | # \____|_| \_\_____|_____|_| \_| /___\___|_| |_| # -# CONTROL IF ZENSOURCE is REAL. (./g1_SURVEY.sh creates TX memory) " # COMMENT WILL BREAK (G1 <=> ZEN) STRICT RELATION [[ ! -f ~/.zen/cache/g1_TX_inputs/zen.$ZENSOURCE ]] && echo "ERROR# UNKNOWN ~/.zen/cache/g1_TX_inputs/zen.$ZENSOURCE !!" && exit 1 @@ -166,7 +165,7 @@ echo "$ISSUER" > ~/.zen/tag/${AAH}/_tag.issuer # TX ISSUER G1PUBKEY OR SSB_MESSA # g1pub for current G1SSB Node later access... # Using sha256sum / openssl / natools.py (libsodium) ######################################################################## -[[ ! -f ~/.ipfs/keystore/${AA}.key ]] && ipfs key gen -t rsa -s 2048 ${AA}.key +[[ ! -f ~/.ipfs/keystore/${AA}.key ]] && J0=$(ipfs key gen -t rsa -s 2048 ${AA}.key) # WRITE BBH for QRCode BB verification echo "$BBH" > ~/.zen/tag/${AAH}/_tag.BB.sha # BB pgp symetric publishkey @@ -175,7 +174,7 @@ openssl aes-256-cbc -pbkdf2 -k "$BB" -salt -in ~/.ipfs/keystore/${AA}.key -out ~ $MY_PATH/tools/natools.py encrypt -p $g1pub -i ~/.ipfs/keystore/${AA}.key -o ~/.zen/tag/${AAH}/_ipfs.publishkey.crypt # LOG echo " - +${AA}.key CYPHERING PUBLISH KEY __ _ _/_/ __/|_ __/|_ | | @@ -284,10 +283,6 @@ echo "0" > ~/.zen/tag/${AAH}/_chain.n # Tag modification number (0 first) NANODATE=$(date -u +%s%N) echo "$NANODATE" > ~/.zen/tag/${AAH}/_chain.nanodate # Nanodate notification -echo " - _|_ _.o._ -(_| |(_||| | : $NANODATE : 0 -" I0=$(ipfs add -qr ~/.zen/tag/${AAH} | tail -n 1) echo "${I0}" > ~/.zen/tag/${AAH}/_chain @@ -296,10 +291,20 @@ cp -f ~/.zen/tag/${AAH}/_chain ~/.zen/tag/${AAH}/_chain.prev I=$(ipfs add -qr ~/.zen/tag/${AAH} | tail -n 1) echo "${I}" > ~/.zen/tag/${AAH}/_chain +echo " + _|_ _.o._ +(_| |(_||| | : $NANODATE + +J0=${J0} +I0=${I0} +I=${I} +" + # IPNS name publish J=$(ipfs name publish -k ${AA}.key --quieter /ipfs/${I}) -[[ ! ${J} ]] && echo "Problem publishing" && exit 1 -# ipfs pin rm ${I} && ipfs pin rm ${I0} && rm -Rf ~/.zen/tag/${AAH} && rm ~/.ipfs/keystore/${AA}.key +[[ ! ${J} ]] && echo "Problem publishing" +[[ ! ${J} ]] && echo "ipfs pin rm ${I}; ipfs pin rm ${I0}; rm -Rf ~/.zen/tag/${AAH}; rm ~/.ipfs/keystore/${AA}.key" +[[ ! ${J} ]] && exit 1 echo "${J}" > ~/.zen/tag/${AAH}/_ipns # INDEXING ZenTag into SWARM