diff --git a/RUNTIME/SECTOR.refresh.sh b/RUNTIME/SECTOR.refresh.sh index 0338988d..15003171 100755 --- a/RUNTIME/SECTOR.refresh.sh +++ b/RUNTIME/SECTOR.refresh.sh @@ -290,12 +290,14 @@ echo "" > ~/.z ################################################### ## EXTRACT SECTOR LAST WEEK TIDDLERS TO IPFSNODEID CACHE - echo "(☉_☉ ) ${SECTOR}.week.rss.json (☉_☉ )" - mkdir -p ~/.zen/tmp/${IPFSNODEID}/SECTORS/ - rm -f ~/.zen/tmp/${IPFSNODEID}/SECTORS/${SECTOR}.week.rss.json + echo "(☉_☉ ) ${REGION}.week.rss.json (☉_☉ )" + rm -Rf ~/.zen/tmp/${IPFSNODEID}/SECTORS/ ## TODO REMOVE + + mkdir -p ~/.zen/tmp/${IPFSNODEID}/REGIONS/ + rm -f ~/.zen/tmp/${IPFSNODEID}/REGIONS/${REGION}.week.rss.json ## CREATING 7 DAYS JSON RSS STREAM tiddlywiki --load ${INDEX} \ - --output ~/.zen/tmp/${IPFSNODEID}/SECTORS --render '.' "${SECTOR}.week.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-7]!is[system]!tag[G1Voeu]]' + --output ~/.zen/tmp/${IPFSNODEID}/REGIONS --render '.' "${SECTOR}.week.rss.json" 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-7]!is[system]!tag[G1Voeu]]' ## TODO FILTER INFORMATION WITH MULTIPLE SIGNATURES (DONE in REGION.refresh.sh) ## TODO EXPORT AS RSS ## https://talk.tiddlywiki.org/t/has-anyone-generated-an-rss-feed-from-tiddlywiki/966/28 diff --git a/RUNTIME/UPLANET.refresh.sh b/RUNTIME/UPLANET.refresh.sh index b77c9a4b..e07af7a4 100755 --- a/RUNTIME/UPLANET.refresh.sh +++ b/RUNTIME/UPLANET.refresh.sh @@ -169,7 +169,6 @@ echo "" > ~/ #~ SECTORSATGEN="${EARTHCID}/sat_render.html?southWestLat=${SLAT}&southWestLon=${SLON}°=0.1&ipns=${SECTORNS}" #~ echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Map.html #~ echo "" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Sat.html - rm ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR*.html ## CODE CLEANING TODO REMOVE ## REGION LINKING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ${RLAT}_${RLON} RLAT=$(echo ${LAT} | cut -d '.' -f 1) diff --git a/install.sh b/install.sh index 088ed28b..9bc48fe9 100755 --- a/install.sh +++ b/install.sh @@ -56,7 +56,7 @@ echo "#############################################" echo "######### INSTALL MULTIMEDIA TOOLS ######" echo "#############################################" # removed : sqlite -for i in qrencode pv gnupg pandoc ca-certificates basez jq bc file gawk ffmpeg dnsutils ntpdate v4l-utils espeak vlc mp3info musl-dev openssl* detox nmap httrack html2text ssmtp imagemagick; do +for i in qrencode pv gnupg gpa pandoc ca-certificates basez jq bc file gawk ffmpeg dnsutils ntpdate v4l-utils espeak vlc mp3info musl-dev openssl* detox nmap httrack html2text ssmtp imagemagick; do if [ $(dpkg-query -W -f='${Status}' $i 2>/dev/null | grep -c "ok installed") -eq 0 ]; then echo ">>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< Installation $i <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<" sudo apt install -y $i @@ -225,7 +225,6 @@ end=`date +%s` echo Execution time was `expr $end - $start` seconds. echo "#############################################" echo "Please finish keygen procedure" -echo " https://pad.p2p.legal/keygen" echo "#############################################" ########################################################## @@ -237,7 +236,7 @@ echo "#############################################" #~ && xdg-open "http://astroport.localhost:1234" \ #~ || ~/.zen/Astroport.ONE/command.sh - xdg-open "https://chaton.g1sms.fr" + xdg-open "https://pad.p2p.legal/keygen" else diff --git a/tools/jaklis/setup.sh b/tools/jaklis/setup.sh index 6caec3a7..4a03deb9 100755 --- a/tools/jaklis/setup.sh +++ b/tools/jaklis/setup.sh @@ -12,6 +12,9 @@ done python -m pip install -r requirements.txt +## INSTALL SYSTEM WIDE mkdir -p ~/.local/bin/ -cp ${MY_PATH}/jaklis.py > ~/.local/bin/jaklis.py -chmod u+x ~/.local/bin/jaklis.py + +cp ${MY_PATH}/jaklis.py ~/.local/bin/jaklis +cp ${MY_PATH}/.env ~/.local/bin/ +chmod u+x ~/.local/bin/jaklis diff --git a/tools/mailjet.sh b/tools/mailjet.sh index 7fc0aae4..17de432f 100755 --- a/tools/mailjet.sh +++ b/tools/mailjet.sh @@ -67,8 +67,9 @@ export RECIPIENT_EMAIL=${mail} # + HTML in FILE rm -f ~/.zen/tmp/email.txt -[[ -s $messfile ]] && cat $messfile >> ~/.zen/tmp/email.txt \ -|| echo "$messfile" >> ~/.zen/tmp/email.txt +[[ -s $messfile ]] \ + && cat $messfile >> ~/.zen/tmp/email.txt \ + || echo "$messfile" >> ~/.zen/tmp/email.txt EMAILZ=$(ipfs add -q ~/.zen/tmp/email.txt) echo "/ipfs/${EMAILZ}" diff --git a/tools/my.sh b/tools/my.sh index 61f1b759..0c09a242 100755 --- a/tools/my.sh +++ b/tools/my.sh @@ -459,6 +459,7 @@ myASTROTUBE="https://$(myAstroTube)" && myIPFS="https://ipfs.$(myDomainName)" \ && myHOST="astroport.$(myHostName)" \ && myG1BILLET="https://libra.copylaradio.com" \ + && myIPFSW="https://ipfs.copylaradio.com" \ || true ## zIP :: PUT YOUR Internet Box IP IN ~/.zen/♥Box ( Forward PORTS 8080 4001 5001 33101 33102 1234 12345 45780 to 45790 )