pump it up
This commit is contained in:
parent
6c5fbe3ab2
commit
ddc5bd7b95
|
|
@ -54,43 +54,49 @@ ${MY_PATH}/../tools/jaklis/jaklis.py -k ~/.zen/game/players/${PLAYER}/secret.dun
|
|||
|
||||
[[ ! -s $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json ]] && echo "NO PAYMENT HISTORY" && exit 1
|
||||
|
||||
cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -r
|
||||
## DEBUG ## cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -r
|
||||
|
||||
## GET @ in
|
||||
PLINES=("$(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -r .[].comment | grep 'Financement du JEu')")
|
||||
for LINE in $(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq -rc .[] | grep 'Bro'); do
|
||||
|
||||
for LINE in "${PLINES[@]}"; do
|
||||
|
||||
echo "MATCHING INCOMING COMMENT : $LINE"
|
||||
JSON=$(cat $HOME/.zen/game/players/${PLAYER}/G1PalPay/$PLAYER.history.json | jq .[] | jq -r 'select(.comment=="'"$LINE"'")')
|
||||
echo "MATCHING IN COMMENT"
|
||||
JSON=$LINE
|
||||
IDATE=$(echo $JSON | jq -r .date)
|
||||
IPUBKEY=$(echo $JSON | jq -r .pubkey)
|
||||
IAMOUNT=$(echo $JSON | jq -r .amount)
|
||||
IAMOUNTUD=$(echo $JSON | jq -r .amountUD)
|
||||
ICOMMENT=$(echo $JSON | jq -r .comment)
|
||||
|
||||
echo $IDATE $IPUBKEY $IAMOUNT [$IAMOUNTUD]
|
||||
echo $IDATE $IPUBKEY $IAMOUNT [$IAMOUNTUD] $ICOMMENT
|
||||
|
||||
EMAILS=("${LINE}")
|
||||
for EMAIL in "${EMAILS[@]}"; do
|
||||
for EMAIL in "${ICOMMENT[@]}";
|
||||
|
||||
if [[ "${EMAIL}" =~ ^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$ ]]; then
|
||||
echo "VALID EMAIL : ${EMAIL}"
|
||||
|
||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export FOUND
|
||||
$($MY_PATH/../tools/search_for_this_email_in_players.sh ${EMAIL}) ## export ASTROTW
|
||||
|
||||
if [[ ! ${FOUND} ]]; then
|
||||
if [[ ! ${ASTROTW} ]]; then
|
||||
|
||||
echo "# NEW VISA $(date)"
|
||||
SALT="" && PEPPER=""
|
||||
echo "VISA.new : \"$SALT\" \"$PEPPER\" \"${EMAIL}\" \"$PSEUDO\" \"${URL}\""
|
||||
$(${MY_PATH}/../tools/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${URL}" | tail -n 1) # export ASTROTW=$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS
|
||||
#~ $(${MY_PATH}/../tools/VISA.new.sh "$SALT" "$PEPPER" "${EMAIL}" "$PSEUDO" "${URL}" | tail -n 1) # export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS
|
||||
|
||||
${MY_PATH}/../tools/mailjet.sh "${EMAIL}" "BRO. VOILA TO TW. $PLAYER" ## WELCOME NEW PLAYER
|
||||
## CREATE new PLAYER IN myASTROTUBE
|
||||
curl -x ${myASTROTUBE}/?salt=0&pepper=0&g1pub=_URL&email=${EMAIL}
|
||||
|
||||
${MY_PATH}/../tools/mailjet.sh "${EMAIL}" "BRO. TON TW $PLAYER $(myIpfsGw)/$ASTROTW" ## WELCOME NEW PLAYER
|
||||
|
||||
|
||||
fi
|
||||
|
||||
## MAKE FRIEND & SEND PROPORTIONNAL G1
|
||||
## MAKE FRIENDS & SEND G1
|
||||
echo "My PalPay Friend $ASTROMAIL
|
||||
TW : $ASTROTW
|
||||
G1 : $ASTROG1
|
||||
RSS : $ASTROFEED"
|
||||
|
||||
|
||||
|
||||
else
|
||||
|
|
|
|||
|
|
@ -36,7 +36,8 @@ header {
|
|||
visibility: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
<!-- Typed text animation -->
|
||||
<script src="http://127.0.0.1:8080/ipfs/QmYyJmAT3cUbjk4vVWQG7LdpY3HkFH9phFD1VzzetHrgpa"></script>
|
||||
</head>
|
||||
<body>
|
||||
<header>
|
||||
|
|
@ -55,7 +56,14 @@ header {
|
|||
<br>
|
||||
<input type='hidden' name='salt' value='0'></br></br>
|
||||
<input type='hidden' name='pepper' value='0'></br></br>
|
||||
<h2><span>Vos Vidéos 👍 et plus encore...</span></h2><input type="hidden" name=g1pub value='https://www.youtube.com/playlist?list=LL'></br>
|
||||
<h2>
|
||||
<div id="typed-strings">
|
||||
<p><span>Vos vidéos favorites 👍 ^3223 et plus encore ...</span>^2222</p>
|
||||
<p>Créez votre <strong><em><u>👉<a href="https://astroport.copylaradio.com">TW</a>👈 </u></em></strong>^5112</p>
|
||||
</div>
|
||||
<span id="typed"></span>
|
||||
</h2>
|
||||
<input type="hidden" name=g1pub value='https://www.youtube.com/playlist?list=LL'></br>
|
||||
<span>Email : </span><input name=email value=''></br></br>
|
||||
<input type='submit' value='[(♥‿‿♥)]'>
|
||||
</form>
|
||||
|
|
@ -120,6 +128,15 @@ Take possession of your TW. Make freedom of expression uncensurable, unstoppable
|
|||
</main>
|
||||
</body>
|
||||
|
||||
<script>
|
||||
var typed = new Typed('#typed', {
|
||||
stringsElement: '#typed-strings',
|
||||
smartBackspace: true,
|
||||
backDelay: 700,
|
||||
loop: true,
|
||||
typeSpeed: 40
|
||||
});
|
||||
</script>
|
||||
|
||||
<script>
|
||||
const el = document.getElementById('yellow');
|
||||
|
|
|
|||
|
|
@ -411,7 +411,7 @@ echo "Notez vos PHRASES et votre PASS"; sleep 1
|
|||
|
||||
echo $PSEUDO > ~/.zen/tmp/PSEUDO ## Return data to start.sh
|
||||
|
||||
echo "export ASTROTW=$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS"
|
||||
echo "export ASTROTW=/ipns/$ASTRONAUTENS ASTROG1=$G1PUB ASTROMAIL=$EMAIL ASTROFEED=$FEEDNS"
|
||||
|
||||
## CLEANING CACHE
|
||||
rm -Rf ~/.zen/tmp/${MOATS}
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ mail="$1" # EMAIL DESTINATAIRE
|
|||
|
||||
messfile="$2" # FICHIER A AJOUTER AU CORPS MESSAGE
|
||||
|
||||
SUBJECT="[(♥‿‿♥)] Station Astroport : $(hostname -f)"
|
||||
SUBJECT="[(♥‿‿♥)] Station Astroport : $(myHostName)"
|
||||
MESSAGE="( ◕‿◕)\n\n Bonjour $PLAYER\n\n UN MESSAGE POUR VOUS.\n\nAstroport\n/ipns/$IPFSNODEID"
|
||||
|
||||
echo "
|
||||
|
|
@ -37,7 +37,9 @@ Bcc: support@qo-op.com
|
|||
Subject: SUBJECT
|
||||
MESSAGE
|
||||
" > ~/.zen/tmp/email.txt
|
||||
[[ -s $messfile ]] && cat $messfile >> ~/.zen/tmp/email.txt
|
||||
|
||||
[[ -s $messfile ]] && cat $messfile >> ~/.zen/tmp/email.txt \
|
||||
|| echo "$messfile" >> ~/.zen/tmp/email.txt
|
||||
|
||||
|
||||
cat ~/.zen/tmp/email.txt | sed "s~EMAIL~${mail}~g" | sed "s~SUBJECT~${SUBJECT}~g" | sed "s~MESSAGE~${MESSAGE}~g" | ssmtp -v ${mail}
|
||||
|
|
|
|||
343
tools/my.sh
343
tools/my.sh
|
|
@ -1,359 +1,364 @@
|
|||
#shellcheck shell=sh disable=SC2034
|
||||
|
||||
Base32Normalize() {
|
||||
awk '{printf $0}' | basenc --base32 | Normalize
|
||||
awk '{printf $0}' | basenc --base32 | Normalize
|
||||
}
|
||||
|
||||
Normalize() {
|
||||
awk '{print tolower($1)}' | sed 's/\(_\|+\)/./g; s/=//g;'
|
||||
awk '{print tolower($1)}' | sed 's/\(_\|+\)/./g; s/=//g;'
|
||||
}
|
||||
|
||||
Revert() {
|
||||
awk -F. '{for (i=NF; i>1; i--) printf("%s.",$i); print $1;}'
|
||||
awk -F. '{for (i=NF; i>1; i--) printf("%s.",$i); print $1;}'
|
||||
}
|
||||
|
||||
isLan() {
|
||||
local isLan=$(ip route |awk '$1 == "default" {print $3}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \
|
||||
|| route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \
|
||||
|| true)
|
||||
[ -n "$isLan" ] && echo "$isLan" || true
|
||||
local isLan=$(ip route |awk '$1 == "default" {print $3}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \
|
||||
|| route -n |awk '$1 == "0.0.0.0" {print $2}' | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|(^172\.2[0-9]\.)|(^172\.3[0-1]\.)|(^::1$)|(^[fF][cCdD])/" \
|
||||
|| true)
|
||||
[ -n "$isLan" ] && echo "$isLan" || true
|
||||
} 2>/dev/null
|
||||
|
||||
isPlayerLegal() {
|
||||
local isPlayerLegal=$(cat "$(myPlayerPath)"/.legal 2>/dev/null || true)
|
||||
[ -n "$isPlayerLegal" ] && echo "$isPlayerLegal" || true
|
||||
local isPlayerLegal=$(cat "$(myPlayerPath)"/.legal 2>/dev/null || true)
|
||||
[ -n "$isPlayerLegal" ] && echo "$isPlayerLegal" || true
|
||||
}
|
||||
|
||||
myAstroFeedKey() {
|
||||
local myAstroFeedKey=$(ipfs --api "$(myIpfsApi)" key list -l | awk '$2 == "'"$(myPlayerFeed)"'" {print $1}')
|
||||
[ -n "$myAstroFeedKey" ] && echo "$myAstroFeedKey"
|
||||
local myAstroFeedKey=$(ipfs --api "$(myIpfsApi)" key list -l | awk '$2 == "'"$(myPlayerFeed)"'" {print $1}')
|
||||
[ -n "$myAstroFeedKey" ] && echo "$myAstroFeedKey"
|
||||
}
|
||||
|
||||
myAstroFeedKeyFile() {
|
||||
local myAstroFeedKeyFile="$(myIpfsKeyStore)/key_$(myPlayerFeed | Base32Normalize)"
|
||||
[ -f "$myAstroFeedKeyFile" ] && echo "$myAstroFeedKeyFile"
|
||||
local myAstroFeedKeyFile="$(myIpfsKeyStore)/key_$(myPlayerFeed | Base32Normalize)"
|
||||
[ -f "$myAstroFeedKeyFile" ] && echo "$myAstroFeedKeyFile"
|
||||
}
|
||||
|
||||
myAstroKey() {
|
||||
local myAstroKey=$(ipfs --api "$(myIpfsApi)" key list -l | awk '$2 == "'"$(myPlayer)"'" {print $1}')
|
||||
[ -n "$myAstroKey" ] && echo "$myAstroKey"
|
||||
local myAstroKey=$(ipfs --api "$(myIpfsApi)" key list -l | awk '$2 == "'"$(myPlayer)"'" {print $1}')
|
||||
[ -n "$myAstroKey" ] && echo "$myAstroKey"
|
||||
}
|
||||
|
||||
myAstroKeyFile() {
|
||||
local myAstroKeyFile="$(myIpfsKeyStore)/key_$(myPlayer | Base32Normalize)"
|
||||
[ -f "$myAstroKeyFile" ] && echo "$myAstroKeyFile"
|
||||
local myAstroKeyFile="$(myIpfsKeyStore)/key_$(myPlayer | Base32Normalize)"
|
||||
[ -f "$myAstroKeyFile" ] && echo "$myAstroKeyFile"
|
||||
}
|
||||
|
||||
myAstroPath() {
|
||||
local myAstroPath=$(cd ~/.zen/Astroport.ONE/ && pwd -P)
|
||||
[ -n "$myAstroPath" ] && echo "$myAstroPath"
|
||||
local myAstroPath=$(cd ~/.zen/Astroport.ONE/ && pwd -P)
|
||||
[ -n "$myAstroPath" ] && echo "$myAstroPath"
|
||||
}
|
||||
|
||||
myDate() {
|
||||
local myDate=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
[ -n "$myDate" ] && echo "$myDate"
|
||||
local myDate=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
[ -n "$myDate" ] && echo "$myDate"
|
||||
}
|
||||
|
||||
myDomainName() {
|
||||
local myDomainName=$(domainname 2>/dev/null) && [ "$myDomainName" = "(none)" ] && myDomainName=$(hostname -d 2>/dev/null) && [ -z "$myDomainName" ] && myDomainName="localhost"
|
||||
[ -n "$myDomainName" ] && echo "$myDomainName"
|
||||
local myDomainName=$(domainname 2>/dev/null) && [ "$myDomainName" = "(none)" ] && myDomainName=$(hostname -d 2>/dev/null) && [ -z "$myDomainName" ] && myDomainName="localhost"
|
||||
[ -n "$myDomainName" ] && echo "$myDomainName"
|
||||
}
|
||||
|
||||
myHttp() {
|
||||
[ -n "$(myHttpHeader)" ] \
|
||||
&& local myHttp="$(myHttpHeader)
|
||||
[ -n "$(myHttpHeader)" ] \
|
||||
&& local myHttp="$(myHttpHeader)
|
||||
|
||||
" || local myHttp=""
|
||||
[ -n "$(myHttpContent)" ] && myHttp="${myHttp}$(myHttpContent)"
|
||||
[ -n "$myHttp" ] && echo "$myHttp"
|
||||
[ -n "$(myHttpContent)" ] && myHttp="${myHttp}$(myHttpContent)"
|
||||
[ -n "$myHttp" ] && echo "$myHttp"
|
||||
}
|
||||
|
||||
myHttpContent() {
|
||||
[ -n "$(myIpfsHash)" ] \
|
||||
&& local myHttpContent="<html><head><title>302 Found</title></head><body><h1>Found</h1>
|
||||
[ -n "$(myIpfsHash)" ] \
|
||||
&& local myHttpContent="<html><head><title>302 Found</title></head><body><h1>Found</h1>
|
||||
<p>The document is <a href=\"ipfs/$(myIpfsHash)\">here</a> in IPFS.</p></body></html>" \
|
||||
&& echo "$myHttpContent"
|
||||
}
|
||||
|
||||
myHttpHeader() {
|
||||
[ -n "$(myIpfsHash)" ] \
|
||||
&& local myHttpHeader="HTTP/1.0 302 Found
|
||||
[ -n "$(myIpfsHash)" ] \
|
||||
&& local myHttpHeader="HTTP/1.0 302 Found
|
||||
Content-Type: text/html; charset=UTF-8
|
||||
Content-Length: $(myHttpContent |wc -c)
|
||||
Date: $(date -R)
|
||||
Location: ipfs/$(myIpfsHash)
|
||||
Server: and" \
|
||||
&& [ -n "$(myIpfsKey)" ] && myHttpHeader="${myHttpHeader}
|
||||
&& [ -n "$(myIpfsKey)" ] && myHttpHeader="${myHttpHeader}
|
||||
set-cookie: AND=$(myIpfsKey); expires=$(date -R -d "+1 month"); path=/; domain=.$(myDomainName); Secure; SameSite=lax"
|
||||
[ -n "$myHttpHeader" ] && echo "$myHttpHeader"
|
||||
}
|
||||
|
||||
myHome() {
|
||||
local myHome=$(cd ~ && pwd -P)
|
||||
[ -n "$myHome" ] && echo "$myHome"
|
||||
local myHome=$(cd ~ && pwd -P)
|
||||
[ -n "$myHome" ] && echo "$myHome"
|
||||
}
|
||||
|
||||
myHostName() {
|
||||
local myHostName=$(hostname |sed 's/\.'"$(myDomainName)"'$//')
|
||||
[ -n "$(myDomainName)" ] && myHostName="${myHostName}.$(myDomainName)"
|
||||
[ -n "$myHostName" ] && echo "$myHostName"
|
||||
local myHostName=$(hostname |sed 's/\.'"$(myDomainName)"'$//')
|
||||
[ -n "$(myDomainName)" ] && myHostName="${myHostName}.$(myDomainName)"
|
||||
[ -n "$myHostName" ] && echo "$myHostName"
|
||||
}
|
||||
|
||||
myIp() {
|
||||
local myIp=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
[ -n "$myIp" ] && echo "$myIp" || echo "127.0.0.1"
|
||||
local myIp=$(hostname -I | awk '{print $1}' | head -n 1)
|
||||
[ -n "$myIp" ] && echo "$myIp" || echo "127.0.0.1"
|
||||
}
|
||||
|
||||
myIpfs() {
|
||||
[ -n "$(myIpfsHash)" ] \
|
||||
&& local myIpfs="${myIPFS}/ipfs/$(myIpfsHash)" \
|
||||
&& echo "$myIpfs"
|
||||
[ -n "$(myIpfsHash)" ] \
|
||||
&& local myIpfs="${myIPFS}/ipfs/$(myIpfsHash)" \
|
||||
&& echo "$myIpfs"
|
||||
}
|
||||
|
||||
myIpfsApi() {
|
||||
ipfs --api "$(cat "$(myHome)"/.ipfs/api)" swarm peers >/dev/null 2>&1 \
|
||||
&& local myIpfsApi=$(cat "$(myHome)"/.ipfs/api)
|
||||
[ -n "$myIpfsApi" ] && echo "$myIpfsApi"
|
||||
ipfs --api "$(cat "$(myHome)"/.ipfs/api)" swarm peers >/dev/null 2>&1 \
|
||||
&& local myIpfsApi=$(cat "$(myHome)"/.ipfs/api)
|
||||
[ -n "$myIpfsApi" ] && echo "$myIpfsApi"
|
||||
}
|
||||
|
||||
myIpfsApiGw() {
|
||||
[ -n "$isLAN" ] \
|
||||
&& local myIpfsApiGw="http://ipfs.localhost:5001" \
|
||||
|| local myIpfsApiGw="https://ipfs.$(myHostName)/api"
|
||||
[ -n "$myIpfsApiGw" ] && echo "$myIpfsApiGw"
|
||||
[ -n "$isLAN" ] \
|
||||
&& local myIpfsApiGw="http://ipfs.localhost:5001" \
|
||||
|| local myIpfsApiGw="https://ipfs.$(myHostName)/api"
|
||||
[ -n "$myIpfsApiGw" ] && echo "$myIpfsApiGw"
|
||||
}
|
||||
|
||||
myIpfsBootstrapNode() {
|
||||
[ -n "$(myIpfsBootstrapNodes)" ] \
|
||||
&& local myIpfsBootstrapNode=$(myIpfsBootstrapNodes | shuf | head -1)
|
||||
[ -n "$myIpfsBootstrapNode" ] && echo "$myIpfsBootstrapNode"
|
||||
[ -n "$(myIpfsBootstrapNodes)" ] \
|
||||
&& local myIpfsBootstrapNode=$(myIpfsBootstrapNodes | shuf | head -1)
|
||||
[ -n "$myIpfsBootstrapNode" ] && echo "$myIpfsBootstrapNode"
|
||||
}
|
||||
|
||||
myIpfsBootstrapNodes() {
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myIpfsBootstrapNodes=$(awk -F/ '$6 != "" {print}' "$(myAstroPath)/A_boostrap_nodes.txt")
|
||||
[ -n "$myIpfsBootstrapNodes" ] && echo "$myIpfsBootstrapNodes"
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myIpfsBootstrapNodes=$(awk -F/ '$6 != "" {print}' "$(myAstroPath)/A_boostrap_nodes.txt")
|
||||
[ -n "$myIpfsBootstrapNodes" ] && echo "$myIpfsBootstrapNodes"
|
||||
}
|
||||
|
||||
myIpfsGw() {
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myIpfsGw=$(head -n2 "$(myAstroPath)/A_boostrap_nodes.txt" | tail -n 1 | cut -d ' ' -f 2)
|
||||
[ -n "$myIpfsGw" ] && echo "$myIpfsGw"
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myIpfsGw=$(head -n2 "$(myAstroPath)/A_boostrap_nodes.txt" | tail -n 1 | cut -d ' ' -f 2)
|
||||
[ -n "$myIpfsGw" ] && echo "$myIpfsGw"
|
||||
}
|
||||
|
||||
myIpfsHash() {
|
||||
[ -f "$(myPath)"/localhost/latest ] \
|
||||
&& local myIpfsHash=$(cat "$(myPath)"/localhost/latest) \
|
||||
|| local myIpfsHash=$(myHtml |ipfs add -q)
|
||||
[ ! -f "$(myPath)"/localhost/latest ] \
|
||||
&& echo "$myIpfsHash" > "$(myPath)"/localhost/latest
|
||||
[ -n "$myIpfsHash" ] && echo "$myIpfsHash"
|
||||
[ -f "$(myPath)"/localhost/latest ] \
|
||||
&& local myIpfsHash=$(cat "$(myPath)"/localhost/latest) \
|
||||
|| local myIpfsHash=$(myHtml |ipfs add -q)
|
||||
[ ! -f "$(myPath)"/localhost/latest ] \
|
||||
&& echo "$myIpfsHash" > "$(myPath)"/localhost/latest
|
||||
[ -n "$myIpfsHash" ] && echo "$myIpfsHash"
|
||||
}
|
||||
|
||||
myIpfsKey() {
|
||||
local myIpfsKey=$(ipfs --api "$(myIpfsApi)" key list -l | awk '$2 == "self" {print $1}')
|
||||
[ -n "$myIpfsKey" ] && echo "$myIpfsKey"
|
||||
local myIpfsKey=$(ipfs --api "$(myIpfsApi)" key list -l | awk '$2 == "self" {print $1}')
|
||||
[ -n "$myIpfsKey" ] && echo "$myIpfsKey"
|
||||
}
|
||||
|
||||
myIpfsKeyStore() {
|
||||
local myIpfsKeyStore=$(cd "$(myHome)"/.ipfs/keystore && pwd -P)
|
||||
[ -n "$myIpfsKeyStore" ] && echo "$myIpfsKeyStore"
|
||||
local myIpfsKeyStore=$(cd "$(myHome)"/.ipfs/keystore && pwd -P)
|
||||
[ -n "$myIpfsKeyStore" ] && echo "$myIpfsKeyStore"
|
||||
}
|
||||
|
||||
myIpfsPeerId() {
|
||||
local myIpfsPeerId=$(jq -r .Identity.PeerID "$(myHome)"/.ipfs/config)
|
||||
[ -n "$myIpfsPeerId" ] && echo "$myIpfsPeerId"
|
||||
local myIpfsPeerId=$(jq -r .Identity.PeerID "$(myHome)"/.ipfs/config)
|
||||
[ -n "$myIpfsPeerId" ] && echo "$myIpfsPeerId"
|
||||
}
|
||||
|
||||
myIpns() {
|
||||
[ -n "$(myIpfsKey)" ] \
|
||||
&& local myIpns="${myIPFS}/ipns/$(myIpfsKey)" \
|
||||
&& echo "$myIpns"
|
||||
[ -n "$(myIpfsKey)" ] \
|
||||
&& local myIpns="${myIPFS}/ipns/$(myIpfsKey)" \
|
||||
&& echo "$myIpns"
|
||||
}
|
||||
|
||||
myPath() {
|
||||
local myPath=$(cd ~/.zen/game/players/ && pwd -P)
|
||||
[ -n "$myPath" ] && echo "$myPath"
|
||||
local myPath=$(cd ~/.zen/game/players/ && pwd -P)
|
||||
[ -n "$myPath" ] && echo "$myPath"
|
||||
}
|
||||
|
||||
myPlayer() {
|
||||
local myPlayer=$(cat "$(myPath)"/.current/.player 2>/dev/null)
|
||||
[ -n "$myPlayer" ] && echo "$myPlayer"
|
||||
local myPlayer=$(cat "$(myPath)"/.current/.player 2>/dev/null)
|
||||
[ -n "$myPlayer" ] && echo "$myPlayer"
|
||||
}
|
||||
|
||||
myPlayerApi() {
|
||||
ipfs --api "$(cat "$(myPlayerPath)"/.ipfs/api )" swarm peers >/dev/null 2>&1 \
|
||||
&& local myPlayerApi=$(cat "$(myPlayerPath)"/.ipfs/api)
|
||||
[ -n "$myPlayerApi" ] && echo "$myPlayerApi"
|
||||
ipfs --api "$(cat "$(myPlayerPath)"/.ipfs/api )" swarm peers >/dev/null 2>&1 \
|
||||
&& local myPlayerApi=$(cat "$(myPlayerPath)"/.ipfs/api)
|
||||
[ -n "$myPlayerApi" ] && echo "$myPlayerApi"
|
||||
}
|
||||
|
||||
myPlayerApiGw() {
|
||||
[ -n "$(myReyalp)" ] \
|
||||
&& { [ -n "$isLAN" ] \
|
||||
&& local myPlayerApiGw="http://ipfs.$(myHostName):5001" \
|
||||
|| local myPlayerApiGw="https://ipfs.$(myReyalp).$(myHostName)/api" \
|
||||
;}
|
||||
[ -n "$myPlayerApiGw" ] && echo "$myPlayerApiGw"
|
||||
[ -n "$(myReyalp)" ] \
|
||||
&& { [ -n "$isLAN" ] \
|
||||
&& local myPlayerApiGw="http://ipfs.$(myHostName):5001" \
|
||||
|| local myPlayerApiGw="https://ipfs.$(myReyalp).$(myHostName)/api" \
|
||||
;}
|
||||
[ -n "$myPlayerApiGw" ] && echo "$myPlayerApiGw"
|
||||
}
|
||||
|
||||
myPlayerDomain() {
|
||||
echo "$(myPlayer)" | grep "@" >/dev/null \
|
||||
&& local myPlayerDomain=$(echo "$(myPlayer)" | awk -F "@" '{print $2}' | Normalize)
|
||||
[ -n "$myPlayerDomain" ] && echo "$myPlayerDomain"
|
||||
echo "$(myPlayer)" | grep "@" >/dev/null \
|
||||
&& local myPlayerDomain=$(echo "$(myPlayer)" | awk -F "@" '{print $2}' | Normalize)
|
||||
[ -n "$myPlayerDomain" ] && echo "$myPlayerDomain"
|
||||
}
|
||||
|
||||
myPlayerFeed() {
|
||||
[ -n "$(myPlayer)" ] \
|
||||
&& local myPlayerFeed="$(myPlayer)_feed"
|
||||
[ -n "$myPlayerFeed" ] && echo "$myPlayerFeed"
|
||||
[ -n "$(myPlayer)" ] \
|
||||
&& local myPlayerFeed="$(myPlayer)_feed"
|
||||
[ -n "$myPlayerFeed" ] && echo "$myPlayerFeed"
|
||||
}
|
||||
|
||||
myPlayerFeedKey() {
|
||||
local myPlayerFeedKey=$(ipfs --api "$(myPlayerApi)" key list -l | awk '$2 == "'"$(myPlayerFeed)"'" {print $1}')
|
||||
[ -n "$myPlayerFeedKey" ] && echo "$myPlayerFeedKey"
|
||||
local myPlayerFeedKey=$(ipfs --api "$(myPlayerApi)" key list -l | awk '$2 == "'"$(myPlayerFeed)"'" {print $1}')
|
||||
[ -n "$myPlayerFeedKey" ] && echo "$myPlayerFeedKey"
|
||||
}
|
||||
|
||||
myPlayerFeedKeyFile() {
|
||||
local myPlayerFeedKeyFile="$(myIpfsKeyStore)/key_$(myPlayerFeed | Base32Normalize)"
|
||||
[ -f "$myPlayerFeedKeyFile" ] && echo "$myPlayerFeedKeyFile"
|
||||
local myPlayerFeedKeyFile="$(myIpfsKeyStore)/key_$(myPlayerFeed | Base32Normalize)"
|
||||
[ -f "$myPlayerFeedKeyFile" ] && echo "$myPlayerFeedKeyFile"
|
||||
}
|
||||
|
||||
myPlayerG1Pub() {
|
||||
local myPlayerG1Pub=$(cat "$(myPlayerPath)"/.g1pub 2>/dev/null)
|
||||
[ -n "$myPlayerG1Pub" ] && echo "$myPlayerG1Pub"
|
||||
local myPlayerG1Pub=$(cat "$(myPlayerPath)"/.g1pub 2>/dev/null)
|
||||
[ -n "$myPlayerG1Pub" ] && echo "$myPlayerG1Pub"
|
||||
}
|
||||
|
||||
myPlayerHome() {
|
||||
echo "$(myPlayer)" | grep "@" >/dev/null \
|
||||
&& local myPlayerHome=$(cd "$(dirname "$(myHome)")/$(myPlayer)" && pwd -P)
|
||||
[ -n "$myPlayerHome" ] && echo "$myPlayerHome"
|
||||
echo "$(myPlayer)" | grep "@" >/dev/null \
|
||||
&& local myPlayerHome=$(cd "$(dirname "$(myHome)")/$(myPlayer)" && pwd -P)
|
||||
[ -n "$myPlayerHome" ] && echo "$myPlayerHome"
|
||||
}
|
||||
|
||||
myPlayerHost() {
|
||||
[ -n "$(myReyalp)" ] \
|
||||
&& { [ -n "$isLAN" ] \
|
||||
&& local myPlayerHost="$(myHostName)" \
|
||||
|| local myPlayerHost="$(myReyalp).$(myHostName)" \
|
||||
;}
|
||||
[ -n "$myPlayerHost" ] && echo "$myPlayerHost"
|
||||
[ -n "$(myReyalp)" ] \
|
||||
&& { [ -n "$isLAN" ] \
|
||||
&& local myPlayerHost="$(myHostName)" \
|
||||
|| local myPlayerHost="$(myReyalp).$(myHostName)" \
|
||||
;}
|
||||
[ -n "$myPlayerHost" ] && echo "$myPlayerHost"
|
||||
}
|
||||
|
||||
myPlayerKey() {
|
||||
local myPlayerKey=$(ipfs --api "$(myPlayerApi)" key list -l | awk '$2 == "'"$(myPlayer)"'" {print $1}')
|
||||
[ -n "$myPlayerKey" ] && echo "$myPlayerKey"
|
||||
local myPlayerKey=$(ipfs --api "$(myPlayerApi)" key list -l | awk '$2 == "'"$(myPlayer)"'" {print $1}')
|
||||
[ -n "$myPlayerKey" ] && echo "$myPlayerKey"
|
||||
}
|
||||
|
||||
myPlayerKeyFile() {
|
||||
local myPlayerKeyFile="$(myPlayerKeyStore)/key_$(myPlayer | Base32Normalize)"
|
||||
[ -f "$myPlayerKeyFile" ] && echo "$myPlayerKeyFile"
|
||||
local myPlayerKeyFile="$(myPlayerKeyStore)/key_$(myPlayer | Base32Normalize)"
|
||||
[ -f "$myPlayerKeyFile" ] && echo "$myPlayerKeyFile"
|
||||
}
|
||||
|
||||
myPlayerKeyStore() {
|
||||
local myPlayerKeyStore=$(cd "$(myPlayerPath)"/.ipfs/keystore && pwd -P)
|
||||
[ -n "$myPlayerKeyStore" ] && echo "$myPlayerKeyStore"
|
||||
local myPlayerKeyStore=$(cd "$(myPlayerPath)"/.ipfs/keystore && pwd -P)
|
||||
[ -n "$myPlayerKeyStore" ] && echo "$myPlayerKeyStore"
|
||||
}
|
||||
|
||||
myPlayerNs() {
|
||||
local myPlayerNs=$(cat "$(myPlayerPath)"/.playerns 2>/dev/null)
|
||||
[ -n "$myPlayerNs" ] && echo "$myPlayerNs"
|
||||
local myPlayerNs=$(cat "$(myPlayerPath)"/.playerns 2>/dev/null)
|
||||
[ -n "$myPlayerNs" ] && echo "$myPlayerNs"
|
||||
}
|
||||
|
||||
myPlayerPath() {
|
||||
[ -n "$(myPlayer)" ] \
|
||||
&& local myPlayerPath=$(cd "$(myPath)"/"$(myPlayer)" && pwd -P)
|
||||
[ -n "$myPlayerPath" ] && echo "$myPlayerPath"
|
||||
[ -n "$(myPlayer)" ] \
|
||||
&& local myPlayerPath=$(cd "$(myPath)"/"$(myPlayer)" && pwd -P)
|
||||
[ -n "$myPlayerPath" ] && echo "$myPlayerPath"
|
||||
}
|
||||
|
||||
myPlayerPseudo() {
|
||||
local myPlayerPseudo=$(cat "$(myPlayerPath)"/.pseudo 2>/dev/null)
|
||||
[ -n "$myPlayerPseudo" ] && echo "$myPseudo"
|
||||
local myPlayerPseudo=$(cat "$(myPlayerPath)"/.pseudo 2>/dev/null)
|
||||
[ -n "$myPlayerPseudo" ] && echo "$myPseudo"
|
||||
}
|
||||
|
||||
myPlayerUser() {
|
||||
echo "$(myPlayer)" | grep "@" >/dev/null \
|
||||
&& local myPlayerUser=$(echo "$(myPlayer)" | awk -F "@" '{print $1}' | Normalize)
|
||||
[ -n "$myPlayerUser" ] && echo "$myPlayerUser"
|
||||
echo "$(myPlayer)" | grep "@" >/dev/null \
|
||||
&& local myPlayerUser=$(echo "$(myPlayer)" | awk -F "@" '{print $1}' | Normalize)
|
||||
[ -n "$myPlayerUser" ] && echo "$myPlayerUser"
|
||||
}
|
||||
|
||||
myPlayerUserDomain() {
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myPlayerUserDomain="$(myPlayerUser).$(myPlayerDomain)" \
|
||||
&& echo "$myPlayerUserDomain"
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myPlayerUserDomain="$(myPlayerUser).$(myPlayerDomain)" \
|
||||
&& echo "$myPlayerUserDomain"
|
||||
}
|
||||
|
||||
myReyalp() {
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myReyalp="$(myPlayerUser).$(myPlayerDomain)" \
|
||||
&& echo "$myReyalp" \
|
||||
|| echo "$(myPlayer)"
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myReyalp="$(myPlayerUser).$(myPlayerDomain)" \
|
||||
&& echo "$myReyalp" \
|
||||
|| echo "$(myPlayer)"
|
||||
}
|
||||
|
||||
myReyalpHome() {
|
||||
[ -n "$(myReyalpResuPath)" ] \
|
||||
&& local myReyalpHome=$(cd "$(case ${RESU_HOME:-mail} in \
|
||||
dns) echo /dns/$(myReyalpResuPath) ;; \
|
||||
*) echo /home/$(myReyalpMail) ;; \
|
||||
esac)" && pwd -P)
|
||||
[ -n "$myReyalpHome" ] && echo "$myReyalpHome"
|
||||
[ -n "$(myReyalpResuPath)" ] \
|
||||
&& local myReyalpHome=$(cd "$(case ${RESU_HOME:-mail} in \
|
||||
dns) echo /dns/$(myReyalpResuPath) ;; \
|
||||
*) echo /home/$(myReyalpMail) ;; \
|
||||
esac)" && pwd -P)
|
||||
[ -n "$myReyalpHome" ] && echo "$myReyalpHome"
|
||||
}
|
||||
|
||||
myReyalpMail() {
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myReyalpMail=$(echo "$(myPlayer)" | Normalize)
|
||||
[ -n "$myReyalpMail" ] && echo "$myReyalpMail"
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myReyalpMail=$(echo "$(myPlayer)" | Normalize)
|
||||
[ -n "$myReyalpMail" ] && echo "$myReyalpMail"
|
||||
}
|
||||
|
||||
myReyalpNiamod() {
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myReyalpNiamod=$(echo "$(myPlayerDomain)" | Revert)
|
||||
[ -n "$myReyalpNiamod" ] && echo "$myReyalpNiamod"
|
||||
[ -n "$(myPlayerDomain)" ] \
|
||||
&& local myReyalpNiamod=$(echo "$(myPlayerDomain)" | Revert)
|
||||
[ -n "$myReyalpNiamod" ] && echo "$myReyalpNiamod"
|
||||
}
|
||||
|
||||
myReyalpResu() {
|
||||
[ -n "$(myPlayerUser)" ] \
|
||||
&& local myReyalpResu=$(echo "$(myPlayerUser)" | Revert)
|
||||
[ -n "$myReyalpResu" ] && echo "$myReyalpResu"
|
||||
[ -n "$(myPlayerUser)" ] \
|
||||
&& local myReyalpResu=$(echo "$(myPlayerUser)" | Revert)
|
||||
[ -n "$myReyalpResu" ] && echo "$myReyalpResu"
|
||||
}
|
||||
|
||||
myReyalpResuNiamod() {
|
||||
[ -n "$(myReyalpNiamod)" ] \
|
||||
&& local myReyalpResuNiamod="$(myReyalpNiamod).$(myReyalpResu)" \
|
||||
&& echo "$myReyalpResuNiamod"
|
||||
[ -n "$(myReyalpNiamod)" ] \
|
||||
&& local myReyalpResuNiamod="$(myReyalpNiamod).$(myReyalpResu)" \
|
||||
&& echo "$myReyalpResuNiamod"
|
||||
}
|
||||
|
||||
myReyalpResuPath() {
|
||||
[ -n "$(myReyalpResuNiamod)" ] \
|
||||
&& local myReyalpResuPath=$(echo "$(myReyalpResuNiamod)" | sed 's/\./\//g';)
|
||||
[ -n "$myReyalpResuPath" ] && echo "$myReyalpResuPath"
|
||||
[ -n "$(myReyalpResuNiamod)" ] \
|
||||
&& local myReyalpResuPath=$(echo "$(myReyalpResuNiamod)" | sed 's/\./\//g';)
|
||||
[ -n "$myReyalpResuPath" ] && echo "$myReyalpResuPath"
|
||||
}
|
||||
|
||||
myHtml() {
|
||||
local myHtml=$($RUN sed \
|
||||
-e "s~\"http://127.0.0.1:1234/\"~\"${myIPFS}/\"~g" \
|
||||
-e "s~\"http://127.0.0.1:1234\"~\"${myASTROPORT}\"~g" \
|
||||
-e "s~http://127.0.0.1:8080~${myIPFS}~g" \
|
||||
-e "s~http://127.0.0.1:12345~http://${myHOST}:12345~g" \
|
||||
-e "s~https://ipfs.copylaradio.com~${myIPFSGW}~g" \
|
||||
-e "s~_IPFSNODEID_~${IPFSNODEID}~g" \
|
||||
-e "s~_HOSTNAME_~$(hostname)~g" \
|
||||
-e "s~.000.~.$(printf '%03d' "$(seq 0 17 |shuf -n 1)").~g" \
|
||||
local myHtml=$($RUN sed \
|
||||
-e "s~\"http://127.0.0.1:1234\"~\"${myASTROPORT}\"~g" \
|
||||
-e "s~http://127.0.0.1:8080~${myIPFS}~g" \
|
||||
-e "s~http://127.0.0.1:12345~http://${myHOST}:12345~g" \
|
||||
-e "s~https://ipfs.copylaradio.com~${myIPFSGW}~g" \
|
||||
-e "s~_IPFSNODEID_~${IPFSNODEID}~g" \
|
||||
-e "s~_HOSTNAME_~$(hostname)~g" \
|
||||
-e "s~.000.~.$(printf '%03d' "$(seq 0 17 |shuf -n 1)").~g" \
|
||||
~/.zen/Astroport.ONE/templates/register.html)
|
||||
[ -z "$isLAN" ] \
|
||||
|| myHtml=$($RUN echo "$myHtml" | sed \
|
||||
[ -z "$isLAN" ] \
|
||||
|| myHtml=$($RUN echo "$myHtml" | sed \
|
||||
-e "s~<input type='"'hidden'"' name='"'salt'"' value='"'0'"'>~<input name='"'salt'"' value='"''"'>~g" \
|
||||
-e "s~<input type='"'hidden'"' name='"'pepper'"' value='"'0'"'>~<input name='"'pepper'"' value='"''"'>~g")
|
||||
[ -n "$myHtml" ] && echo "$myHtml"
|
||||
[ -n "$myHtml" ] && echo "$myHtml"
|
||||
}
|
||||
|
||||
myTs() {
|
||||
local myTs=$(date +%s)
|
||||
[ -n "$myTs" ] && echo "$myTs"
|
||||
local myTs=$(date +%s)
|
||||
[ -n "$myTs" ] && echo "$myTs"
|
||||
}
|
||||
|
||||
myTube() {
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myTube=$(head -n2 "$(myAstroPath)/A_boostrap_nodes.txt" | tail -n 1 | cut -d ' ' -f 3)
|
||||
[ -n "$myTube" ] && echo "$myTube"
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myTube=$(head -n2 "$(myAstroPath)/A_boostrap_nodes.txt" | tail -n 1 | cut -d ' ' -f 3)
|
||||
[ -n "$myTube" ] && echo "$myTube"
|
||||
}
|
||||
|
||||
myAstroTube() {
|
||||
[ -f "$(myAstroPath)/A_boostrap_nodes.txt" ] \
|
||||
&& local myAstroTube=$(head -n2 "$(myAstroPath)/A_boostrap_nodes.txt" | tail -n 1 | cut -d ' ' -f 3 | sed "s~ipfs~astroport~g")
|
||||
[ -n "$myAstroTube" ] && echo "$myAstroTube"
|
||||
}
|
||||
|
||||
IPFSNODEID="$(myIpfsPeerId)"
|
||||
|
|
@ -368,6 +373,8 @@ myIP="$(myIp)"
|
|||
myIPFS="http://ipfs.$(myDomainName):8080"
|
||||
myIPFSGW="$(myIpfsGw)"
|
||||
myTUBE="$(myTube)"
|
||||
myASTROTUBE="https://$(myAstroTube)"
|
||||
|
||||
## WAN STATION
|
||||
[ -z "$isLAN" ] \
|
||||
&& myASTROPORT="https://astroport.$(myDomainName)" \
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ MY_PATH="`dirname \"$0\"`" # relative
|
|||
MY_PATH="`( cd \"$MY_PATH\" && pwd )`" # absolutized and normalized
|
||||
ME="${0##*/}"
|
||||
|
||||
. "${MY_PATH}/tools/my.sh"
|
||||
. "${MY_PATH}/my.sh"
|
||||
|
||||
start=`date +%s`
|
||||
MOATS=$(date -u +"%Y%m%d%H%M%S%4N")
|
||||
|
|
|
|||
Loading…
Reference in New Issue