Convert symlink $(readlink ~/.zen/ipfs)
This commit is contained in:
parent
50cf9e0fcb
commit
67e77f20e1
|
|
@ -46,7 +46,7 @@ curl -s ${GCHANGE}/user/profile/${G1PUB} > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gc
|
|||
|
||||
Gtitle=$(cat ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange.json | jq -r '._source.title')
|
||||
[[ $Gtitle ]] && echo "$Gtitle" > ~/.zen/ipfs/.$IPFSNODEID/G1SSB/_g1.gchange_title
|
||||
echo"# ACTUAL _g1.gchange_title=$Gtitle"
|
||||
echo "# ACTUAL _g1.gchange_title=$Gtitle"
|
||||
|
||||
# UPDATE _g1.astroport_title with city
|
||||
Atitle="Station $YOU@$XZUID"
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@ echo "Adding ~/.zen/ipfs to IPFS"
|
|||
# then
|
||||
echo "$(date -u +%s%N | cut -b1-13)" > ~/.zen/ipfs/.${IPFSNODEID}/.timestamp
|
||||
echo $MIPFS > ~/.zen/ipfs/.${IPFSNODEID}/.chain
|
||||
MIPFS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
|
||||
MIPFS=$(ipfs add -rHq $(readlink ~/.zen/ipfs) | tail -n 1)
|
||||
NODEIPNS=$(ipfs --timeout=180s name publish --quieter /ipfs/$MIPFS)
|
||||
echo "$NODEIPNS:TIME:$(cat ~/.zen/ipfs/.${IPFSNODEID}/.timestamp):CHAIN:$(cat ~/.zen/ipfs/.${IPFSNODEID}/.chain)"
|
||||
# fi
|
||||
|
|
|
|||
136
zen/zen_MAKE.sh
136
zen/zen_MAKE.sh
|
|
@ -51,27 +51,27 @@ IPFS: $IPFSNODEID
|
|||
########################################################################
|
||||
# ZenTag is an IPFS/IPNS datastructure shared into IPFS, publish
|
||||
# ~~~ Draft ~~~~ Draft ~~~~ Draft ~~~~ Draft ~~~~ Draft ~~~~
|
||||
# _chain # ZenTag IPFS Hash
|
||||
# _chain.n # Sequence Number
|
||||
# _chain.nanodate # Current nanodate
|
||||
# _chain.prev # Previous IPFS Hash
|
||||
# _g1.node.creator # G1SSB wallet pubkey
|
||||
# _tag.issuer # G1TX ISSUER pubkey
|
||||
# _tag.zensource # G1TX HASH or SSB timestamp
|
||||
# _ipfs.node.creatorcat # NODE IPFS ID
|
||||
# _ipfs.publishkey.BB.aes # BB SYMcypher of IPNS publish key
|
||||
# _ipfs.publishkey.crypt # G1SSB ASYMcypher of IPNS publish key
|
||||
# _tag.BB.sha # BB sha256sum
|
||||
# _tag.uid # ZenTag UID
|
||||
# _tag.zen # ZentTag balance
|
||||
# _ipns # /ipns/ address
|
||||
# _chain # ZenTag IPFS Hash
|
||||
# _chain.n # Sequence Number
|
||||
# _chain.nanodate # Current nanodate
|
||||
# _chain.prev # Previous IPFS Hash
|
||||
# _g1.node.creator # G1SSB wallet pubkey
|
||||
# _tag.issuer # G1TX ISSUER pubkey
|
||||
# _tag.zensource # G1TX HASH or SSB timestamp
|
||||
# _ipfs.node.creatorcat # NODE IPFS ID
|
||||
# _ipfs.publishkey.BB.aes # BB SYMcypher of IPNS publish key
|
||||
# _ipfs.publishkey.crypt # G1SSB ASYMcypher of IPNS publish key
|
||||
# _tag.BB.sha # BB sha256sum
|
||||
# _tag.uid # ZenTag UID
|
||||
# _tag.zen # ZentTag balance
|
||||
# _ipns # /ipns/ address
|
||||
# PASSENGER FILE (put to IPFS and cypher link in IPNS ZenTag)
|
||||
# _passenger.filename # Passenger filename
|
||||
# _passenger.ipfs.crypt # G1SSB cyphered IPFS Passenger link
|
||||
# _passenger.read # Zen value asked for READING
|
||||
# _passenger.park # Zen value paid for PARKING
|
||||
# _passenger.filename # Passenger filename
|
||||
# _passenger.ipfs.crypt # G1SSB cyphered IPFS Passenger link
|
||||
# _passenger.read # Zen value asked for READING
|
||||
# _passenger.park # Zen value paid for PARKING
|
||||
# Only if contract executed => add new cyphered links
|
||||
# _passenger.contract.sh # Zen CONTRACT TODO
|
||||
# _passenger.contract.sh # Zen CONTRACT TODO
|
||||
# COmpare with code to verify and extend Draft
|
||||
# TODO: Could be converted into yaml or json if you like...
|
||||
########################################################################
|
||||
|
|
@ -126,8 +126,8 @@ AAH=$(echo -n ${AA} | sha256sum | cut -d ' ' -f 1) # ZenTag Name SHA256
|
|||
# TODO ACTIVATE SWARM UNICITY CHECK
|
||||
# Create Unique Zentag for all IPFS SWARM!
|
||||
while [[ $(grep -Rwl "$AA" ~/.zen/ipfs_swarm/.12D3KooW*/TAG/*/_tag.uid) ]]; do
|
||||
AA=$(echo $($MY_PATH/tools/diceware.sh 6 | xargs) | sed s/\ /_/g )
|
||||
AAH=$(echo -n ${AA} | sha256sum | cut -d ' ' -f 1)
|
||||
AA=$(echo $($MY_PATH/tools/diceware.sh 6 | xargs) | sed s/\ /_/g )
|
||||
AAH=$(echo -n ${AA} | sha256sum | cut -d ' ' -f 1)
|
||||
done
|
||||
|
||||
# BB key is a 4 word diceware printed on QRCode for Human use.
|
||||
|
|
@ -209,36 +209,36 @@ echo "
|
|||
\_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/ \_/
|
||||
|
||||
"
|
||||
# SEARCH FOR SAME SOURCE in IPFS... Not to make it twice...
|
||||
CHECKSWARM=$(grep -Rwl "$ZENSOURCE" ~/.zen/ipfs_swarm/.12D3KooW*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
|
||||
[[ $CHECKSWARM == "" ]] && CHECKSWARM=$(grep -Rwl "$ZENSOURCE" ~/.zen/ipfs/.$IPFSNODEID/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
|
||||
[[ -s ~/.zen/ipfs/.$IPFSNODEID/TAG/$ZENSOURCE/_tag.issuer ]] && ISSUERSWARM=$(cat ~/.zen/ipfs/.$IPFSNODEID/TAG/$ZENSOURCE/_tag.issuer)
|
||||
[[ "$CHECKSWARM" != "" && "$ISSUERSWARM" == "$ISSUER" ]] && ipfs key rm $keyname && rm -Rf ~/.zen/tag/${AAH} \
|
||||
&& echo "$ZENSOURCE ALREADY COPIED IN IPFS SWARM. $CHECKSWARM CANCEL" && exit 1
|
||||
# NO DUPLICATE
|
||||
# SEARCH FOR SAME SOURCE in IPFS... Not to make it twice...
|
||||
CHECKSWARM=$(grep -Rwl "$ZENSOURCE" ~/.zen/ipfs_swarm/.12D3KooW*/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
|
||||
[[ $CHECKSWARM == "" ]] && CHECKSWARM=$(grep -Rwl "$ZENSOURCE" ~/.zen/ipfs/.$IPFSNODEID/TAG/*/_tag.zensource | tail -n 1 | cut -f 6 -d '/')
|
||||
[[ -s ~/.zen/ipfs/.$IPFSNODEID/TAG/$ZENSOURCE/_tag.issuer ]] && ISSUERSWARM=$(cat ~/.zen/ipfs/.$IPFSNODEID/TAG/$ZENSOURCE/_tag.issuer)
|
||||
[[ "$CHECKSWARM" != "" && "$ISSUERSWARM" == "$ISSUER" ]] && ipfs key rm $keyname && rm -Rf ~/.zen/tag/${AAH} \
|
||||
&& echo "$ZENSOURCE ALREADY COPIED IN IPFS SWARM. $CHECKSWARM CANCEL" && exit 1
|
||||
# NO DUPLICATE
|
||||
|
||||
echo "ADDING TO IPFS.................$(date)"
|
||||
# ADD PASSENGER TO IPFS # COULD BE SUPER LONG !!!
|
||||
IPASSENGER=$(ipfs add -q "$PASSENGER" -w | tail -n 1)
|
||||
# TODO COMPARE DISK WRITING SPEED AND AVAILABLE SPACE TO CHOOSE BEST IN SWARM
|
||||
echo "$(date) ............... YES /ipfs/$IPASSENGER"
|
||||
echo "ADDING TO IPFS.................$(date)"
|
||||
# ADD PASSENGER TO IPFS # COULD BE SUPER LONG !!!
|
||||
IPASSENGER=$(ipfs add -q "$PASSENGER" -w | tail -n 1)
|
||||
# TODO COMPARE DISK WRITING SPEED AND AVAILABLE SPACE TO CHOOSE BEST IN SWARM
|
||||
echo "$(date) ............... YES /ipfs/$IPASSENGER"
|
||||
|
||||
echo "$IPASSENGER" > ~/.zen/tag/${AAH}/_passenger.ipfs
|
||||
# GET FILE NAME
|
||||
PASSENGERNAME=$(basename -- "$PASSENGER")
|
||||
echo "$PASSENGERNAME" > ~/.zen/tag/${AAH}/_passenger.filename
|
||||
echo "$IPASSENGER" > ~/.zen/tag/${AAH}/_passenger.ipfs
|
||||
# GET FILE NAME
|
||||
PASSENGERNAME=$(basename -- "$PASSENGER")
|
||||
echo "$PASSENGERNAME" > ~/.zen/tag/${AAH}/_passenger.filename
|
||||
|
||||
# G1SSB NODE ACCESS
|
||||
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.zen/tag/${AAH}/_passenger.ipfs -o ~/.zen/tag/${AAH}/_passenger.ipfs.crypt
|
||||
# BB OWNER ACCESS
|
||||
openssl aes-256-cbc -pbkdf2 -k "$BB" -salt -in ~/.zen/tag/${AAH}/_passenger.ipfs -out ~/.zen/tag/${AAH}/_passenger.ipfs.BB.aes
|
||||
# G1SSB NODE ACCESS
|
||||
$MY_PATH/tools/natools.py encrypt -p $G1PUB -i ~/.zen/tag/${AAH}/_passenger.ipfs -o ~/.zen/tag/${AAH}/_passenger.ipfs.crypt
|
||||
# BB OWNER ACCESS
|
||||
openssl aes-256-cbc -pbkdf2 -k "$BB" -salt -in ~/.zen/tag/${AAH}/_passenger.ipfs -out ~/.zen/tag/${AAH}/_passenger.ipfs.BB.aes
|
||||
|
||||
# CLEAN CLEARTEXT IPFS link ? LATER MAYBE
|
||||
rm ~/.zen/tag/${AAH}/_passenger.ipfs
|
||||
# CLEAN CLEARTEXT IPFS link ? LATER MAYBE
|
||||
rm ~/.zen/tag/${AAH}/_passenger.ipfs
|
||||
|
||||
# ZEN ECONOMY: ZEN READ payment + PARK rental
|
||||
echo "$READ" > ~/.zen/tag/${AAH}/_passenger.read
|
||||
echo "$PARK" > ~/.zen/tag/${AAH}/_passenger.park
|
||||
# ZEN ECONOMY: ZEN READ payment + PARK rental
|
||||
echo "$READ" > ~/.zen/tag/${AAH}/_passenger.read
|
||||
echo "$PARK" > ~/.zen/tag/${AAH}/_passenger.park
|
||||
|
||||
echo "
|
||||
_passenger.filename : $PASSENGERNAME
|
||||
|
|
@ -329,28 +329,28 @@ echo "${ISSUER}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.issuer
|
|||
echo "${J}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.ipns
|
||||
|
||||
if [[ "${PASSENGERNAME}" != "" ]]; then
|
||||
echo "${PASSENGERNAME}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.filename
|
||||
# COPY METADATA!! TODO : Please Extend filesource FOR new metadata types. torrent ?
|
||||
extractor=$(cat "$METADATA" | jq -r '.extractor')
|
||||
echo "${PASSENGERNAME}" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.filename
|
||||
# COPY METADATA!! TODO : Please Extend filesource FOR new metadata types. torrent ?
|
||||
extractor=$(cat "$METADATA" | jq -r '.extractor')
|
||||
|
||||
youtubeid=$(cat "$METADATA" | jq -r '.id')
|
||||
fulltitle=$(cat "$METADATA" | jq -r '.fulltitle')
|
||||
echo "$fulltitle" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.fulltitle
|
||||
# description=$(cat "$METADATA" | jq -r '.description')
|
||||
artist=$(cat "$METADATA" | jq -r '.artist')
|
||||
album=$(cat "$METADATA" | jq -r '.album')
|
||||
duration=$(cat "$METADATA" | jq -r '.duration')
|
||||
upload_date=$(cat "$METADATA" | jq -r '.upload_date')
|
||||
uploader_id=$(cat "$METADATA" | jq -r '.uploader_id')
|
||||
youtubeid=$(cat "$METADATA" | jq -r '.id')
|
||||
fulltitle=$(cat "$METADATA" | jq -r '.fulltitle')
|
||||
echo "$fulltitle" > ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.fulltitle
|
||||
# description=$(cat "$METADATA" | jq -r '.description')
|
||||
artist=$(cat "$METADATA" | jq -r '.artist')
|
||||
album=$(cat "$METADATA" | jq -r '.album')
|
||||
duration=$(cat "$METADATA" | jq -r '.duration')
|
||||
upload_date=$(cat "$METADATA" | jq -r '.upload_date')
|
||||
uploader_id=$(cat "$METADATA" | jq -r '.uploader_id')
|
||||
|
||||
extractor=$(cat "$METADATA" | jq -r '.extractor')
|
||||
[[ ! -f ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json ]] \
|
||||
&& cp -f "${METADATA}" /tmp/
|
||||
mv /tmp/${youtubeid}.info.json ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json
|
||||
extractor=$(cat "$METADATA" | jq -r '.extractor')
|
||||
[[ ! -f ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json ]] \
|
||||
&& cp -f "${METADATA}" /tmp/
|
||||
mv /tmp/${youtubeid}.info.json ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/_tag.passenger.metadata.${extractor}.json
|
||||
fi
|
||||
ls ~/.zen/ipfs/.$IPFSNODEID/TAG/${ZENSOURCE}/
|
||||
|
||||
IWALLETS=$(ipfs add -rHq ~/.zen/ipfs | tail -n 1)
|
||||
IWALLETS=$(ipfs add -rHq $(readlink ~/.zen/ipfs) | tail -n 1)
|
||||
NODEIPNS=$(ipfs name publish --quieter /ipfs/$IWALLETS)
|
||||
|
||||
echo "
|
||||
|
|
@ -397,7 +397,7 @@ ${AA}
|
|||
# SBOT PUBLISH
|
||||
########################################################################
|
||||
if [[ "${PASSENGERNAME}" != "" ]]; then
|
||||
echo "$ISSUER"
|
||||
echo "$ISSUER"
|
||||
msg="$(sbotc get '{"id":"'"$ISSUER"'"}')"
|
||||
# echo "$msg" | jq #DEBUG
|
||||
[[ $msg == "" ]] && echo "ERROR No SSB message for PASSENGER (timestamp: $tstamp)" && exit 1
|
||||
|
|
@ -407,10 +407,10 @@ if [[ "${PASSENGERNAME}" != "" ]]; then
|
|||
[[ $msg_branch == "null" ]] && msg_branch=$ISSUER
|
||||
|
||||
# ATTACH ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg
|
||||
name="ssb_thumb.jpg"
|
||||
id="$(sbotc blobs.add < ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg)"
|
||||
type="$(file -b --mime-type ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg)"
|
||||
size="$(wc -c < ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg)"
|
||||
name="ssb_thumb.jpg"
|
||||
id="$(sbotc blobs.add < ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg)"
|
||||
type="$(file -b --mime-type ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg)"
|
||||
size="$(wc -c < ~/.zen/miam/$ZENSOURCE/ssb_thumb.jpg)"
|
||||
|
||||
export MESSAGE=$(cat << EOF
|
||||
[](http://127.0.0.1:8080/ipfs/$IPASSENGER/$PASSENGERNAME)
|
||||
|
|
|
|||
Loading…
Reference in New Issue