forked from STI/Astroport.ONE
Update Milgram to Wish Fidelity sub wallets @PASS
This commit is contained in:
parent
a9fb7a85c5
commit
d8ec646a3f
|
@ -318,10 +318,13 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
|||
echo "cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${PASS}" --batch"
|
||||
cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${PASS}" --batch > ~/.zen/tmp/${MOATS}/decoded
|
||||
|
||||
## G1CARD COULD BE UP TO 12 MONTH OLD
|
||||
if [[ ! -s ~/.zen/tmp/${MOATS}/decoded ]]; then
|
||||
## COULD BE ONE MONTH OLDER (TODO CHOOSE VALIDITY TIME TO MOVE)
|
||||
UPASS=$(date -d "1 month ago" +"%Y%m")
|
||||
cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${UPASS}" --batch > ~/.zen/tmp/${MOATS}/decoded
|
||||
for ((i = 1; i < 13; i++)); do
|
||||
UPASS=$(date -d "$i months ago" +"%Y%m")
|
||||
cat ~/.zen/tmp/${MOATS}/disco.aes | gpg -d --passphrase "${UPASS}" --batch > ~/.zen/tmp/${MOATS}/decoded
|
||||
[[ -s ~/.zen/tmp/${MOATS}/decoded ]] && WARNING="=== CARD IS ${i} MONTH OLD ===" && CAGE=${i} && break
|
||||
done
|
||||
fi
|
||||
|
||||
# cat ~/.zen/tmp/${MOATS}/disco
|
||||
|
@ -408,11 +411,12 @@ if [[ ${QRCODE:0:5} == "@@@@@" ]]; then
|
|||
G1VOEUCOINS=$(${MY_PATH}/../tools/COINScheck.sh ${G1VOEUPUB} | tail -n 1)
|
||||
echo "<br><b>${VoeuName} $G1VOEUCOINS G1</b>" >> ~/.zen/tmp/${MOATS}/disco
|
||||
|
||||
echo ${WARNING} >> ~/.zen/tmp/${MOATS}/disco
|
||||
|
||||
#CONVERT TO IPNS KEY
|
||||
G1VOEUNS=$(${MY_PATH}/../tools/g1_to_ipfs.py ${G1VOEUPUB})
|
||||
## RETRIEVE IPNS CONTENT
|
||||
echo "http://127.0.0.1:8080/ipns/$G1VOEUNS"
|
||||
echo "${myIPFS}/ipns/$G1VOEUNS"
|
||||
if [[ ! -s ~/.zen/tmp/${MOATS}/${PLAYERORIG1}.${VoeuName}.missive.txt ]]; then
|
||||
HELLO="@PASS :: G1BILLET+ :: ${G1VOEUPUB} :: $(date) :: ${player} :: ${PLAYERORIG1}"
|
||||
echo "${HELLO}"
|
||||
|
|
|
@ -153,16 +153,13 @@ mkdir ~/.zen/tmp/${MOATS}
|
|||
SECTORNS=$(ipfs key import ${SECTORG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/${SECTOR}.priv)
|
||||
ipfs key rm ${SECTORG1PUB}
|
||||
##############################################################
|
||||
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${SECTOR}
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${SECTORNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${SECTOR}/index.html
|
||||
mv ~/.zen/tmp/${MOATS}/${UMAP}/${SECTOR} ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}/
|
||||
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${SECTORNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}/index.html
|
||||
|
||||
SECTORMAPGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Umap.html?southWestLat=${SLAT}&southWestLon=${SLON}°=1&ipns=${SECTORNS}"
|
||||
SECTORSATGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Usat.html?southWestLat=${SLAT}&southWestLon=${SLON}°=1&ipns=${SECTORNS}"
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${SECTORMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Map.html
|
||||
mv ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Map.html ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Map.html
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${SECTORSATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Sat.html
|
||||
mv ~/.zen/tmp/${MOATS}/${UMAP}/SECTOR${SECTOR}.Sat.html ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Sat.html
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${SECTORMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Map.html
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${SECTORSATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${SLAT}_${SLON}.SECTOR.Sat.html
|
||||
|
||||
## REGION LINKING >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> ${CLAT}_${CLON}
|
||||
CLAT=$(echo ${LAT} | cut -d '.' -f 1)
|
||||
|
@ -180,16 +177,13 @@ mkdir ~/.zen/tmp/${MOATS}
|
|||
REGIONNS=$(ipfs key import ${REGIONG1PUB} -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/REGION.priv)
|
||||
ipfs key rm ${REGIONG1PUB}
|
||||
##############################################################
|
||||
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${REGION}
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${REGIONNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${REGION}/index.html
|
||||
mv ~/.zen/tmp/${MOATS}/${UMAP}/${REGION} ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}/
|
||||
mkdir -p ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='/ipns/${REGIONNS}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}/index.html
|
||||
|
||||
REGIONMAPGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Umap.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}"
|
||||
REGIONSATGEN="/ipfs/QmReVMqhMNcKWijAUVmj3EDmHQNfztVUT413m641eV237z/Usat.html?southWestLat=${CLAT}&southWestLon=${CLON}°=1&ipns=${REGIONNS}"
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${REGIONMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html
|
||||
mv ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Map.html ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Map.html
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${REGIONSATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html
|
||||
mv ~/.zen/tmp/${MOATS}/${UMAP}/REGION${REGION}.Sat.html ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Sat.html
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${REGIONMAPGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Map.html
|
||||
echo "<meta http-equiv=\"refresh\" content=\"0; url='${REGIONSATGEN}'\" />" > ~/.zen/tmp/${MOATS}/${UMAP}/${CLAT}_${CLON}.REGION.Sat.html
|
||||
|
||||
## COLLECT RSS FROM ALL PLAYERS WITH SAME UMAP IN SWARM MEMORY
|
||||
cp ~/.zen/tmp/${IPFSNODEID}/UPLANET/_${LAT}_${LON}/RSS/*.rss.json ~/.zen/tmp/${MOATS}/${UMAP}/RSS/ 2>/dev/null
|
||||
|
@ -230,7 +224,7 @@ mkdir ~/.zen/tmp/${MOATS}
|
|||
## GEOLINKING SURROUNDING UMAPS ###############################
|
||||
if [[ ! -s ~/.zen/tmp/${MOATS}/${UMAP}/geolinks.json ]]; then
|
||||
|
||||
${MY_PATH}/../tools/Umap_geolinks.sh "${LAT}" "${LON}" "${UMAP}" "${MOATS}"
|
||||
${MY_PATH}/../tools/Umap_geolinks.sh "${LAT}" "${LON}" "${UMAP}" "${MOATS}" "${UMAPNS}"
|
||||
|
||||
fi
|
||||
### SET navigator.html ## MAKE EVOLVE template/umap.html
|
||||
|
|
|
@ -10,6 +10,7 @@ LAT=$1
|
|||
LON=$2
|
||||
UMAP=$3
|
||||
MOATS=$4
|
||||
UMAPNS=$5
|
||||
|
||||
[[ ! -d ~/.zen/tmp/${MOATS-undefined}/${UMAP-undefined}/${LAT}_${LON} ]] && echo "MUST BE CALLED FROM UPLANET.refresh.sh - EXIT -" && exit 1
|
||||
|
||||
|
|
|
@ -179,7 +179,7 @@ select zwish in "${vlist[@]}"; do
|
|||
## USE TEXT FROM TIDDLER
|
||||
cat ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/${PLAYER}.${VoeuName}.json | jq -r '.[].text' | html2text > ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt
|
||||
echo "
|
||||
Signalez que vous pouvez réaliser ce voeu? Sinon passez le billet un ami." >> ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt
|
||||
${VoeuName} [ ${PLAYER} ] ${UPASS}" >> ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt
|
||||
MILGRAM=$(ipfs add -q ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/g1voeu/index.txt)
|
||||
|
||||
xdg-open http://ipfs.localhost:8080/ipfs/${IMAGIC}
|
||||
|
|
Loading…
Reference in New Issue