jiriks74/dztui
1
0
Fork 0
mirror of https://github.com/aclist/dztui.git synced 2025-04-05 12:03:00 +02:00
Code Issues Wiki Activity Actions

Add dig alternative

Browse source
This commit is contained in:
aclist 2022-09-22 18:37:43 +09:00 committed by GitHub
parent f4abdfdb2d
commit fb5916a0d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
dzgui.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
set -o pipefail set -o pipefail
version=2.7.0-rc.8 version=2.7.0-rc.9
aid=221100 aid=221100
game="dayz" game="dayz"
@ -10,7 +10,7 @@ api="https://api.battlemetrics.com/servers"
sd_res="--width=1280 --height=800" sd_res="--width=1280 --height=800"
config_path="$HOME/.config/dztui/" config_path="$HOME/.config/dztui/"
config_file="${config_path}dztuirc" config_file="${config_path}dztuirc"
tmp=/tmp/dztui.tmp tmp=/tmp/dzgui.tmp
separator="%%" separator="%%"
check_config_msg="Check config values and restart." check_config_msg="Check config values and restart."
issues_url="https://github.com/aclist/dztui/issues" issues_url="https://github.com/aclist/dztui/issues"
@ -268,7 +268,7 @@ varcheck(){
[[ ! -d "$game_dir" ]] && (err "Malformed game path") [[ ! -d "$game_dir" ]] && (err "Malformed game path")
[[ $whitelist =~ [[:space:]] ]] && (err "Separate whitelist values with commas") [[ $whitelist =~ [[:space:]] ]] && (err "Separate whitelist values with commas")
} }
run_depcheck() { run_depcheck(){
if [[ -z $(depcheck) ]]; then if [[ -z $(depcheck) ]]; then
: :
else else
@ -834,7 +834,11 @@ strip_null(){
response=$(echo "$response" | jq -r '[.[]|select(.map//empty)]') response=$(echo "$response" | jq -r '[.[]|select(.map//empty)]')
} }
local_latlon(){ local_latlon(){
local local_ip=$(dig +short myip.opendns.com @resolver1.opendns.com) if [[ -z $(command -v dig) ]]; then
local local_ip=$(curl -Ls "https://ipecho.net/plain")
else
local local_ip=$(dig +short myip.opendns.com @resolver1.opendns.com)
fi
local url="http://ip-api.com/json/$local_ip" local url="http://ip-api.com/json/$local_ip"
local res=$(curl -Ls "$url" | jq -r '"\(.lat),\(.lon)"') local res=$(curl -Ls "$url" | jq -r '"\(.lat),\(.lon)"')
local_lat=$(echo "$res" | awk -F, '{print $1}') local_lat=$(echo "$res" | awk -F, '{print $1}')