From 17f21d560116b3d43ee42ad50f1a7ea3bd2a14be Mon Sep 17 00:00:00 2001 From: fred Date: Fri, 18 Nov 2022 02:24:11 +0100 Subject: [PATCH] apt install basez base16 --- 12345.sh | 2 +- ASTROBOT/PLAYER.refresh.sh | 4 ++-- install.sh | 2 +- tools/VISA.new.sh | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/12345.sh b/12345.sh index 4b543ff2..11756010 100755 --- a/12345.sh +++ b/12345.sh @@ -404,7 +404,7 @@ echo "" > ~/.zen/tmp/.ipfsgw.bad.twt # TODO move in 20h12.sh [[ ! $SECRET ]] && (echo "$HTTPCORS SECRET ERROR - SORRY - CANNOT CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD SECRET (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue # # CRYPTO DECODING CRYPTIP -> myIP - cat ~/.zen/tmp/miz.json | jq -r .[].secret | base32 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 + cat ~/.zen/tmp/miz.json | jq -r .[].secret | base16 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 $MY_PATH/tools/natools.py decrypt -f pubsec -k ~/.zen/tmp/coucou/${MOATS}.secret.key -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1 GWIP=$(cat ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1) diff --git a/ASTROBOT/PLAYER.refresh.sh b/ASTROBOT/PLAYER.refresh.sh index 689815df..659066eb 100755 --- a/ASTROBOT/PLAYER.refresh.sh +++ b/ASTROBOT/PLAYER.refresh.sh @@ -86,7 +86,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( [[ ! $SECRET ]] && (echo "$HTTPCORS SECRET ERROR - SORRY - CANNOT CONTINUE " | nc -l -p ${PORT} -q 1 > /dev/null 2>&1 &) && echo "BAD SECRET (☓‿‿☓) Execution time was "`expr $(date +%s) - $start` seconds. && continue # # CRYPTO DECODING CRYPTIP -> myIP - cat ~/.zen/tmp/miz.json | jq -r .[].secret | base32 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 + cat ~/.zen/tmp/miz.json | jq -r .[].secret | base16 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 $MY_PATH/../tools/natools.py decrypt -f pubsec -k ~/.zen/game/players/$PLAYER/secret.dunikey -i ~/.zen/tmp/myIP.$G1PUB.enc.2 -o ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1 GWIP=$(cat ~/.zen/tmp/myIP.$G1PUB > /dev/null 2>&1) @@ -153,7 +153,7 @@ isLAN=$(echo $myIP | grep -E "/(^127\.)|(^192\.168\.)|(^10\.)|(^172\.1[6-9]\.)|( echo "# CRYPTO ENCODING $GWIP -> CRYPTIP" echo $GWIP > ~/.zen/tmp/GWIP $MY_PATH/../tools/natools.py encrypt -p $G1PUB -i $HOME/.zen/tmp/GWIP -o $HOME/.zen/tmp/myIP.$G1PUB.enc - CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base32) + CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base16) sed -i "s~$GWIP~$CRYPTIP~g" ~/.zen/tmp/${IPFSNODEID}/${PLAYER}/index.html #################### diff --git a/install.sh b/install.sh index 5656b6a5..f70b42f9 100755 --- a/install.sh +++ b/install.sh @@ -63,7 +63,7 @@ echo "#############################################" echo "######### PATIENCE ######" echo "#############################################" # removed : sqlite -for i in qrencode jq bc file gawk yt-dlp ffmpeg dnsutils ntpdate v4l-utils espeak vlc mp3info musl-dev openssl* detox nmap httrack html2text ssmtp imagemagick; do +for i in qrencode basez jq bc file gawk yt-dlp 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 diff --git a/tools/VISA.new.sh b/tools/VISA.new.sh index 1348ecc3..8fb5c412 100755 --- a/tools/VISA.new.sh +++ b/tools/VISA.new.sh @@ -206,12 +206,12 @@ G1PUB=$(cat /tmp/secret.dunikey | grep 'pub:' | cut -d ' ' -f 2) echo "# CRYPTO ENCODING myIP -> CRYPTIP" echo $myIP > ~/.zen/tmp/myIP $MY_PATH/natools.py encrypt -p $G1PUB -i $HOME/.zen/tmp/myIP -o $HOME/.zen/tmp/myIP.$G1PUB.enc - CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base32) + CRYPTIP=$(cat ~/.zen/tmp/myIP.$G1PUB.enc | base16) sed -i "s~_SECRET_~$CRYPTIP~g" ~/.zen/game/players/$PLAYER/ipfs/moa/index.html # echo "# CRYPTO DECODING CRYPTIP -> myIP" tiddlywiki --load ~/.zen/game/players/$PLAYER/ipfs/moa/index.html --output ~/.zen/tmp --render '.' 'MadeInZion.json' 'text/plain' '$:/core/templates/exporters/JsonFile' 'exportFilter' 'MadeInZion' - cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret | base32 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 + cat ~/.zen/tmp/MadeInZion.json | jq -r .[].secret | base16 -d > ~/.zen/tmp/myIP.$G1PUB.enc.2 $MY_PATH/natools.py decrypt -f pubsec -k $HOME/.zen/game/players/$PLAYER/secret.dunikey -i $HOME/.zen/tmp/myIP.$G1PUB.enc.2 -o $HOME/.zen/tmp/myIP.2 # ## CRYPTO PROCESS VALIDATED