From bcc0f6d0dfc45b0286fe79ecec56c10d7570b358 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 16 Mar 2025 22:05:01 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- mm-scripts.sh | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/defaults.inc b/defaults.inc index 0ecb9c8..34eea57 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.10.4-02232025' +VERS='3.10.5-03162025' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" diff --git a/mm-scripts.sh b/mm-scripts.sh index 61ab265..0786841 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -104,8 +104,7 @@ MMSTART(){ until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" - REALWANIP=$(dig +short txt ch whoami.cloudflare @1.0.0.1) - REALWANIP=${REALWANIP//\"/} + REALWANIP=$(curl -s https://api.ipify.org) echo "REALWANIP=\"${REALWANIP}\"" > ${TMPFOLDER}/realwanip "${VPN_START[@]}" >/dev/null 2>&1 @@ -291,8 +290,7 @@ MMSTART(){ cc=0 until [ "${REALWANIP}" != "" ] && [ "${mmip}" != "" ] && [[ "${REALWANIP}" != *"connection timed out"* ]] && [[ "${mmip}" != *"connection timed out"* ]]; do # mmip=$(/usr/bin/dig +short +time=2 myip.opendns.com @208.67.222.222) - mmip=$(dig +short txt ch whoami.cloudflare @1.0.0.1) - mmip=${mmip//\"/} + mmip=$(curl -s https://api.ipify.org) echo "(${mmip}) (${REALWANIP})" if [ ${cc} -eq 20 ]; then echo @@ -727,8 +725,7 @@ MMSTATUS(){ # mmip=$(/usr/bin/dig +short myip.opendns.com @resolver1.opendns.com) # mmip=$(/usr/bin/dig +short +time=2 myip.opendns.com @208.67.222.222) - mmip=$(dig +short txt ch whoami.cloudflare @1.0.0.1) - mmip=${mmip//\"/} + mmip=$(curl -s https://api.ipify.org) if [ "${REALWANIP}" != "${mmip}" ] && [[ "${mmip}" != *"timed out"* ]]; then echo -e "${idsCL[Green]}Good${idsCL[Default]}" else