diff --git a/crowdbunker.sh b/crowdbunker.sh
index f8c52db..8e221d0 100755
--- a/crowdbunker.sh
+++ b/crowdbunker.sh
@@ -244,7 +244,7 @@ echo "##########################################################################
######################### ######################### #########################
## CONSTRUCT 'MOA' CHANNEL PUBLICATION ZONE ```rm -Rf ~/.zen/bunkerbox/channels/${CHANNEL} to reset```
AmIBootStrap=$(cat ~/.zen/astrXbian/A_boostrap_nodes.txt 2>/dev/null | grep $IPFSNODEID)
- if [[ ! -f ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/twindex.html ]]; then
+ if [[ ! -f ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/index.html ]]; then
mkdir -p ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/
mkdir -p ~/.zen/bunkerbox/channels/${CHANNEL}/
# New tiddlywiki with moa key
@@ -284,23 +284,35 @@ echo "##########################################################################
# cp ~/.ipfs/keystore/${channelfilename} ~/.zen/bunkerbox/channels/${CHANNEL}/qo-op_${CHANNEL}.key
echo $channelkey > ~/.zen/bunkerbox/channels/${CHANNEL}/channelkey
-
+ cp -f ~/.zen/bunkerbox/channels/${CHANNEL}/twindex.html ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/index.html
fi
- echo "LINK TW into HOMEPAGE "
- echo "" > ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/index.html
- echo "DONE ###"
-
+ #~ echo "LINK TW into HOMEPAGE "
+ #~ echo "" > ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/index.html
+ #~ echo "DONE ###"
+ TWINDEX="$HOME/.zen/bunkerbox/homepage/tw/${CHANNEL}/index.html"
+ TWMODEL="/ipfs/bafybeieqeozaj4nplyh7dmr2lecbzzrgt2mqs3rzbgdxlb43erhfzc37oq"
+ ## OLD index style REPLACE
+ [[ $(cat ${TWINDEX} | head -n 1 | grep -w '"refresh"') ]] \
+ && echo "============= NEW TW MODEL ="
+ ipfs cat $TWMODEL | sed \
+ -e "s~_BIRTHDATE_~${MOATS}~g" \
+ -e "s~_PSEUDO_~${CHANNEL}~g" \
+ -e "s~_MOAID_~${channelkey}~g" \
+ -e "s~_QOOP_~${IPNSL}~g" \
+ -e "s~_IPFSNODEID_~${IPFSNODEID}~g" \
+ -e "s~_MOAKEY_~qo-op_${CHANNEL}~g" \
+ -e "s~k2k4r8kxfnknsdf7tpyc46ks2jb3s9uvd3lqtcv9xlq9rsoem7jajd75~${channelkey}~g" \
+ > ${TWINDEX}
echo "$CHANNEL IS UP. KEY IS CREATED. WAITING FOR SYNCING. PRINTING KNOWN MOA KEY."
ipfs key list -l | grep -w "qo-op_${CHANNEL}"
- echo "WE COULD ADD MP4 VIDEO TIIDDLER INTO TW"
+ echo "TODO: ADD MP4 VIDEO TIIDDLER INTO TW"
if [[ $(which tiddlywiki) ]]; then
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
- TWINDEX="$HOME/.zen/bunkerbox/homepage/tw/${CHANNEL}/index.html"
FILE_BSIZE=$(du -b "$HOME/.zen/bunkerbox/cache/$VUID/media/" | awk '{print $1}' | tail -n 1)
FILE_SIZE=$(echo "${FILE_BSIZE}" | awk '{ split( "B KB MB GB TB PB" , v ); s=1; while( $1>1024 ){ $1/=1024; s++ } printf "%.2f %s", $1, v[s] }')
@@ -322,7 +334,7 @@ echo '[
"ipfs": "'/ipfs/${IPFSROOT}/${VUID}.m3u8'",
"mediakey": "'${VUID}'",
"modified": "'${MOATS}'",
- "tags": "'${TAGS}'"
+ "tags": "'BunkerBOX Astroport.ONE ipfs'"
}
]' > ~/.zen/bunkerbox/homepage/tw/${CHANNEL}/tiddler.${VUID}.json
@@ -335,9 +347,9 @@ echo '[
if [[ -s ~/.zen/tmp/newindex.html ]]; then
echo "OK TIDDLER. PUBLISHING. WAIT ..."
cp ~/.zen/tmp/newindex.html ${TWINDEX}
- TW5=$(ipfs add -rwHq ~/.zen/bunkerbox/channels/${CHANNEL}/* | tail -n 1)
- echo "## PUBLISHING qo-op_${CHANNEL} /ipfs/$TW5"
- ipfs name publish --key=qo-op_${CHANNEL} /ipfs/$TW5
+ #~ TW5=$(ipfs add -rwHq ~/.zen/bunkerbox/channels/${CHANNEL}/* | tail -n 1)
+ #~ echo "## PUBLISHING qo-op_${CHANNEL} /ipfs/$TW5"
+ #~ ipfs name publish --key=qo-op_${CHANNEL} /ipfs/$TW5
else
echo "ERROR INSERTING TIDDLER"
fi