From 6ef5312d855918227806202ec09da0527d1e4c57 Mon Sep 17 00:00:00 2001 From: "George Liu (eva2000)" Date: Fri, 1 Jul 2022 00:31:05 +1000 Subject: [PATCH] fix VPS_GEOIPCHECK routine in 124.00stable - fix bug https://community.centminmod.com/threads/centmin-sh-getting-stuck.23008/#post-93793, users run cmupdate to update --- centmin-cli.sh | 2 +- centmin.sh | 2 +- inc/cpcheck.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/centmin-cli.sh b/centmin-cli.sh index 4d7e6ba1..a54dfe7a 100755 --- a/centmin-cli.sh +++ b/centmin-cli.sh @@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S") branchname='124.00stable' SCRIPT_MAJORVER='124' SCRIPT_MINORVER='00' -SCRIPT_INCREMENTVER='35' +SCRIPT_INCREMENTVER='36' SCRIPT_VERSIONSHORT="${branchname}" SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.s${SCRIPT_INCREMENTVER}" SCRIPT_DATE='08/05/22' diff --git a/centmin.sh b/centmin.sh index 32b8c2a9..3ba30145 100755 --- a/centmin.sh +++ b/centmin.sh @@ -27,7 +27,7 @@ DT=$(date +"%d%m%y-%H%M%S") branchname='124.00stable' SCRIPT_MAJORVER='124' SCRIPT_MINORVER='00' -SCRIPT_INCREMENTVER='35' +SCRIPT_INCREMENTVER='36' SCRIPT_VERSIONSHORT="${branchname}" SCRIPT_VERSION="${SCRIPT_VERSIONSHORT}.s${SCRIPT_INCREMENTVER}" SCRIPT_DATE='08/05/22' diff --git a/inc/cpcheck.inc b/inc/cpcheck.inc index 8ece732f..3b7a2976 100644 --- a/inc/cpcheck.inc +++ b/inc/cpcheck.inc @@ -2302,7 +2302,7 @@ pureftpdupdates() { if [ "$SECOND_IP" ]; then CNIP="$SECOND_IP" else - CNIP=$(echo "${VPS_ASNCHECK}" | jq -r '.ip') + CNIP=$(echo "$VPS_GEOIPCHECK" | jq -r '.ip') fi # disable anonymous logins by default CHECKPFTPD_ANON=$(grep 'NoAnonymous no' /etc/pure-ftpd/pure-ftpd.conf)