From 57fea71ef59488af9bb4978a6e318812d0d4abb1 Mon Sep 17 00:00:00 2001
From: fred
Date: Mon, 7 Nov 2022 01:07:33 +0100
Subject: [PATCH] [days:created[-120]tag[copylaradio]!tag[humour]]
---
20h12.process.sh | 2 +-
ASTROBOT/G1CopierYoutube.sh | 2 +-
ASTROBOT/G1Voeu.sh | 2 +-
ASTROBOT/VOEUX.refresh.sh | 6 ++--
templates/index.http | 53 +++++++++++++++++++++++-------
templates/register.html | 4 +--
tools/Connect_PLAYER_To_Gchange.sh | 3 +-
7 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/20h12.process.sh b/20h12.process.sh
index a20e1746..64fbb89a 100755
--- a/20h12.process.sh
+++ b/20h12.process.sh
@@ -7,7 +7,7 @@ MY_PATH="`dirname \"$0\"`" # relative
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
ME="${0##*/}"
start=`date +%s`
-
+echo "20H12 (♥‿‿♥) $(hostname)"
myIP=$(hostname -I | awk '{print $1}' | head -n 1)
[[ ! $myIP ]] && myIP="127.0.1.1"
diff --git a/ASTROBOT/G1CopierYoutube.sh b/ASTROBOT/G1CopierYoutube.sh
index 4bd0158c..d1468b5a 100755
--- a/ASTROBOT/G1CopierYoutube.sh
+++ b/ASTROBOT/G1CopierYoutube.sh
@@ -151,7 +151,7 @@ while read YID;
--output ~/.zen/tmp/$WISHKEY --render "$:/core/save/all" "newindex.html" "text/plain"
if [[ -s ~/.zen/tmp/$WISHKEY/newindex.html ]]; then
- echo "Updating $INDEX"
+ echo "$$$ Mise à jour $INDEX"
cp ~/.zen/tmp/$WISHKEY/newindex.html $INDEX
else
echo "Problem with tiddlywiki command. Missing ~/.zen/tmp/$WISHKEY/newindex.html"
diff --git a/ASTROBOT/G1Voeu.sh b/ASTROBOT/G1Voeu.sh
index 05e5c805..901826ef 100755
--- a/ASTROBOT/G1Voeu.sh
+++ b/ASTROBOT/G1Voeu.sh
@@ -209,7 +209,7 @@ convert -gravity northwest -pointsize 50 -fill black -draw "text 30,300 \"$PEPPE
echo "PLAYER TW Update..."
if [[ -s ~/.zen/tmp/newindex.html ]]; then
- echo "Mise à jour $INDEX"
+ echo "$$$ Mise à jour $INDEX"
cp -f ~/.zen/tmp/newindex.html $INDEX
else
echo "ERROR INTO ~/.zen/game/world/$WISHKEY/${PEPPER}.voeu.json"
diff --git a/ASTROBOT/VOEUX.refresh.sh b/ASTROBOT/VOEUX.refresh.sh
index b51c04fe..b25744bd 100755
--- a/ASTROBOT/VOEUX.refresh.sh
+++ b/ASTROBOT/VOEUX.refresh.sh
@@ -93,11 +93,11 @@ do
rm -f ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${PLAYER}.tiddlers.json
echo "TRY EXPORT [tag[G1${WISHNAME}]] FROM $FRIENDTW"
tiddlywiki --load $FRIENDTW \
- --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} --render '.' ${PLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[tag[G1'${WISHNAME}']!tag[G1Voeu]]'
+ --output ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME} --render '.' ${PLAYER}'.tiddlers.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' '[days:created[-1]tag[G1'${WISHNAME}']!tag[G1Voeu]]'
[[ ! -s ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${PLAYER}.tiddlers.json ]] && echo "NO ${WISHNAME} - CONTINUE -" && continue
[[ $(cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${WISHNAME}/${PLAYER}.tiddlers.json) == "[]" ]] && echo "EMPTY ${WISHNAME} - CONTINUE -" && continue
- echo "## WISHES FOUND ;) MIAM "
+ echo "## WISHES FOUND ;) MIAM >>> (◕‿‿◕) <<<"
######################################
## TODO ADD EXTRA TAG ?
# Remove G1${WISHNAME} with WISHNAME Initial TIDDLER
@@ -110,7 +110,7 @@ do
--output ~/.zen/tmp --render "$:/core/save/all" "${ASTRONAUTENS}.newindex.html" "text/plain"
if [[ -s ~/.zen/tmp/${ASTRONAUTENS}.newindex.html ]]; then
- echo "Updating $INDEX"
+ echo "$$$ Mise à jour $INDEX"
cp ~/.zen/tmp/${ASTRONAUTENS}.newindex.html $INDEX
else
echo "Problem with tiddlywiki command. Missing ~/.zen/tmp/${ASTRONAUTENS}.newindex.html"
diff --git a/templates/index.http b/templates/index.http
index b39d062a..e64717ae 100644
--- a/templates/index.http
+++ b/templates/index.http
@@ -8,7 +8,7 @@ Content-Type: text/html; charset=UTF-8
-
+
[Astroport](_HOSTNAME_) - IPFS BIOS - Interplanetray File System + Basic Input Output System + Scuttlebut Confidence Layer Ŋ1
@@ -33,18 +46,9 @@ Content-Type: text/html; charset=UTF-8
Astronaute
- TW Astroport Ŋ1 -
-
-
@@ -54,8 +58,10 @@ setTimeout(() => {
Phrase Une :
Phrase Deux :
- ( TW officiel - Visiteur )
+ ( TW officiel - Visiteur )
+
+
@@ -64,5 +70,30 @@ setTimeout(() => {
+
+
+
diff --git a/templates/register.html b/templates/register.html
index 673910a6..0e3bb471 100644
--- a/templates/register.html
+++ b/templates/register.html
@@ -47,8 +47,8 @@ html {
Associez vos phrases clefs et votre adresse email
Phrase Une ("identifiant")
Phrase Deux ("mot de passe")
- Inscription au bitswap Ŋ1 de 20h12 :
- Email :
+ Inscription au bitswap Ŋ1 de 20h12 :
+ - Email -
diff --git a/tools/Connect_PLAYER_To_Gchange.sh b/tools/Connect_PLAYER_To_Gchange.sh
index 0ad5fca6..93c6b400 100755
--- a/tools/Connect_PLAYER_To_Gchange.sh
+++ b/tools/Connect_PLAYER_To_Gchange.sh
@@ -26,8 +26,7 @@ PSEUDO=$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null)
## REFRESH ASTRONAUTE TW
ASTRONAUTENS=$(ipfs key list -l | grep ${PLAYER} | cut -d ' ' -f1)
- [[ ! $ASTRONAUTENS ]] && echo "WARNING No ${PLAYER} in keystore --" && ASTRONAUTENS=$ASTRONS
- [[ ! $ASTRONAUTENS ]] && echo "Missing ${PLAYER} IPNS KEY - CONTINUE --" && exit 1
+ [[ ! $ASTRONAUTENS ]] && echo "WARNING No ${PLAYER} in keystore -- EXIT" && exit 1
mkdir -p ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/