Arrrgggg [] and {} json
This commit is contained in:
parent
3c4e5a5ff8
commit
962e273916
|
@ -47,7 +47,7 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
mkdir -p ~/.zen/tmp/${MOATS}
|
mkdir -p ~/.zen/tmp/${MOATS}
|
||||||
echo "##################################################################"
|
echo "##################################################################"
|
||||||
echo "##################################################################"
|
echo "##################################################################"
|
||||||
echo ">>>>> PLAYER : ${PLAYER} >>>>>>>>>>>>> REFRESHING TW STATION"
|
echo ">>>>> PLAYER : ${PLAYER} >>>>>>>>>>>>> REFRESHING TW ${MOATS}"
|
||||||
echo "##################################################################"
|
echo "##################################################################"
|
||||||
PSEUDO=$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null)
|
PSEUDO=$(cat ~/.zen/game/players/${PLAYER}/.pseudo 2>/dev/null)
|
||||||
G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub 2>/dev/null)
|
G1PUB=$(cat ~/.zen/game/players/${PLAYER}/.g1pub 2>/dev/null)
|
||||||
|
@ -193,23 +193,30 @@ for PLAYER in ${PLAYERONE[@]}; do
|
||||||
[[ $LON == "null" || $LON == "" ]] && LON="0.00"
|
[[ $LON == "null" || $LON == "" ]] && LON="0.00"
|
||||||
|
|
||||||
SECTOR="_${LAT::-1}_${LON::-1}"
|
SECTOR="_${LAT::-1}_${LON::-1}"
|
||||||
|
|
||||||
## UMAP TODATENS ################
|
## UMAP TODATENS ################
|
||||||
|
|
||||||
ipfs key rm "temp" 2>/dev/null
|
ipfs key rm "temp" 2>/dev/null
|
||||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/todate.ipfskey "${TODATE}${UPLANETNAME}${LAT}" "${TODATE}${UPLANETNAME}${LON}"
|
||||||
UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
|
UMAPNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/todate.ipfskey)
|
||||||
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"umap": "/ipns/${UMAPNS}"}' \
|
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"umap": "/ipns/_UMAPNS_"}' \
|
||||||
> ~/.zen/tmp/${MOATS}/GPStw.json \
|
> ~/.zen/tmp/${MOATS}/GPStw.json \
|
||||||
&& mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
|
&& mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
sed -i "s~_UMAPNS_~${UMAPNS}~g" ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
|
||||||
|
cat ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
echo "UMAP _${LAT}_${LON} UMAPNS=/ipns/${UMAPNS}"
|
||||||
|
|
||||||
ipfs key rm "temp" 2>/dev/null
|
ipfs key rm "temp" 2>/dev/null
|
||||||
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
|
${MY_PATH}/../tools/keygen -t ipfs -o ~/.zen/tmp/${MOATS}/sectodate.ipfskey "${TODATE}${UPLANETNAME}${SECTOR}" "${TODATE}${UPLANETNAME}${SECTOR}"
|
||||||
TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey)
|
TODATESECTORNS=$(ipfs key import "temp" -f pem-pkcs8-cleartext ~/.zen/tmp/${MOATS}/sectodate.ipfskey)
|
||||||
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '.[0] + {"sectortw": "/ipns/${TODATESECTORNS}/TW"}' \
|
cat ~/.zen/tmp/${MOATS}/GPS.json | jq '. + {"sectortw": "_SECTORTW_"}' \
|
||||||
> ~/.zen/tmp/${MOATS}/GPStw.json \
|
> ~/.zen/tmp/${MOATS}/GPSsec.json \
|
||||||
&& mv ~/.zen/tmp/${MOATS}/GPStw.json ~/.zen/tmp/${MOATS}/GPS.json
|
&& mv ~/.zen/tmp/${MOATS}/GPSsec.json ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
sed -i "s~_SECTORTW_~/ipns/${TODATESECTORNS}/TW~g" ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
|
||||||
|
cat ~/.zen/tmp/${MOATS}/GPS.json
|
||||||
|
echo "SECTOR $SECTOR SECTORTW=/ipns/${TODATESECTORNS}/TW"
|
||||||
|
|
||||||
echo "LAT=${LAT}; LON=${LON}; UMAPNS=/ipns/${UMAPNS}; SECTORTW=/ipns/${TODATESECTORNS}/TW"
|
|
||||||
ipfs key rm "temp" 2>/dev/null
|
ipfs key rm "temp" 2>/dev/null
|
||||||
|
|
||||||
## STORE IN PLAYER CACHE
|
## STORE IN PLAYER CACHE
|
||||||
|
|
|
@ -168,12 +168,11 @@ YOMAIN=$(echo ${PLAYER} | cut -d '@' -f 2) # YOMAIN=super.chez-moi.com
|
||||||
# echo "MY PLAYER API GW : $(myPlayerApiGw)"
|
# echo "MY PLAYER API GW : $(myPlayerApiGw)"
|
||||||
|
|
||||||
NID="${myIPFS}"
|
NID="${myIPFS}"
|
||||||
WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
|
#~ WID="https://ipfs.$CLYUSER$YOMAIN.$(myHostName)/api" ## Next Generation API # TODO PLAYER IPFS Docker entrance
|
||||||
WID="https://ipfs.$(myHostName)/api"
|
#~ WID="https://ipfs.$(myHostName)/api"
|
||||||
WID="https://ipfs.$(myHostName)/api"
|
#~ WID="https://ipfs.$(myHostName)/api"
|
||||||
WID="${myAPI}" ## https://ipfs.libra.copylaradio.com
|
WID="${myAPI}" ## https://ipfs.libra.copylaradio.com
|
||||||
|
|
||||||
# WID="http://ipfs.$(myHostName):5001"
|
|
||||||
USALT=$(echo "$SALT" | jq -Rr @uri)
|
USALT=$(echo "$SALT" | jq -Rr @uri)
|
||||||
UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
|
UPEPPER=$(echo "$PEPPER" | jq -Rr @uri)
|
||||||
DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
DISCO="/?salt=${USALT}&pepper=${UPEPPER}"
|
||||||
|
|
Loading…
Reference in New Issue