mirror of
https://github.com/raspiblitz/raspiblitz.git
synced 2025-11-18 18:07:45 +01:00
Merge pull request #131 from piezzo/get_public_ip_from_cli
Get public ip from cli (fixes #100)
This commit is contained in:
@@ -109,24 +109,10 @@ if [ -n ${btc_path} ]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# get IP address & port
|
# get IP address & port
|
||||||
|
networkInfo=$(${network}-cli -datadir=${bitcoin_dir} getnetworkinfo)
|
||||||
local_ip=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
|
local_ip=$(ip addr | grep 'state UP' -A2 | tail -n1 | awk '{print $2}' | cut -f1 -d'/')
|
||||||
public_ip=$(curl -s http://v4.ipv6-test.com/api/myip.php)
|
public_ip=$(curl -s http://v4.ipv6-test.com/api/myip.php)
|
||||||
public_port=$(cat ${bitcoin_dir}/${network}.conf 2>/dev/null | grep port= | awk -F"=" '{print $2}')
|
public_port="$(echo ${networkInfo} | jq -r '.localaddresses [0] .port')"
|
||||||
if [ "${public_port}" = "" ]; then
|
|
||||||
if [ "${network}" = "litecoin" ]; then
|
|
||||||
if [ "${chain}" = "test" ]; then
|
|
||||||
public_port=19333
|
|
||||||
else
|
|
||||||
public_port=9333
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ "${chain}" = "test" ]; then
|
|
||||||
public_port=18333
|
|
||||||
else
|
|
||||||
public_port=8333
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# CHAIN NETWORK
|
# CHAIN NETWORK
|
||||||
public_addr="??"
|
public_addr="??"
|
||||||
@@ -134,7 +120,7 @@ torInfo=""
|
|||||||
# Version
|
# Version
|
||||||
networkVersion=$(${network}-cli -datadir=${bitcoin_dir} -version | cut -d ' ' -f6)
|
networkVersion=$(${network}-cli -datadir=${bitcoin_dir} -version | cut -d ' ' -f6)
|
||||||
# TOR or IP
|
# TOR or IP
|
||||||
onionAddress=$(${network}-cli -datadir=${bitcoin_dir} getnetworkinfo | grep '"address"' | cut -d '"' -f4)
|
onionAddress=$(echo ${networkInfo} | jq -r '.localaddresses [0] .address')
|
||||||
if [ ${#onionAddress} -gt 0 ]; then
|
if [ ${#onionAddress} -gt 0 ]; then
|
||||||
# TOR address
|
# TOR address
|
||||||
public_addr="${onionAddress}:${public_port}"
|
public_addr="${onionAddress}:${public_port}"
|
||||||
|
|||||||
Reference in New Issue
Block a user