From 67832bea31c3c98d0ba93354db1254f8d03b0fc9 Mon Sep 17 00:00:00 2001
From: Nikita Skryabin <nekit2271@gmail.com>
Date: Thu, 5 Sep 2024 16:26:12 +0300
Subject: [PATCH 1/3] refactor: switch model detection to use
 /tmp/sysinfo/model

---
 getdomains-check.sh   | 4 ++--
 getdomains-install.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/getdomains-check.sh b/getdomains-check.sh
index 4cec9ad..ffc84fa 100755
--- a/getdomains-check.sh
+++ b/getdomains-check.sh
@@ -19,7 +19,7 @@ output_21() {
 }
 
 # System Details
-MODEL=$(grep machine /proc/cpuinfo | cut -d ':' -f 2)
+MODEL=$(cat /tmp/sysinfo/model)
 RELEASE=$(grep OPENWRT_RELEASE /etc/os-release | awk -F '"' '{print $2}')
 printf "\033[34;1mModel:$MODEL\033[0m\n"
 printf "\033[34;1mVersion: $RELEASE\033[0m\n"
@@ -462,4 +462,4 @@ fi
 
 # Info
 echo -e "\nTelegram channel: https://t.me/itdoginfo"
-echo "Telegram chat: https://t.me/itdogchat"
\ No newline at end of file
+echo "Telegram chat: https://t.me/itdogchat"
diff --git a/getdomains-install.sh b/getdomains-install.sh
index 0c8ca22..0d0be7c 100755
--- a/getdomains-install.sh
+++ b/getdomains-install.sh
@@ -893,7 +893,7 @@ add_internal_wg() {
 }
 
 # System Details
-MODEL=$(grep machine /proc/cpuinfo | cut -d ':' -f 2)
+MODEL=$(cat /tmp/sysinfo/model)
 RELEASE=$(grep OPENWRT_RELEASE /etc/os-release | awk -F '"' '{print $2}')
 printf "\033[34;1mModel:$MODEL\033[0m\n"
 printf "\033[34;1mVersion: $RELEASE\033[0m\n"

From 0a71e0de9b23850e1bba34a80045af11b688de52 Mon Sep 17 00:00:00 2001
From: Nikita Skryabin <nekit2271@gmail.com>
Date: Thu, 5 Sep 2024 16:31:28 +0300
Subject: [PATCH 2/3] refactor: reuse environment variables from
 /etc/os-release for version checks

---
 getdomains-check.sh   | 8 ++++----
 getdomains-install.sh | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/getdomains-check.sh b/getdomains-check.sh
index ffc84fa..510857e 100755
--- a/getdomains-check.sh
+++ b/getdomains-check.sh
@@ -20,12 +20,12 @@ output_21() {
 
 # System Details
 MODEL=$(cat /tmp/sysinfo/model)
-RELEASE=$(grep OPENWRT_RELEASE /etc/os-release | awk -F '"' '{print $2}')
-printf "\033[34;1mModel:$MODEL\033[0m\n"
-printf "\033[34;1mVersion: $RELEASE\033[0m\n"
+source /etc/os-release
+printf "\033[34;1mModel: $MODEL\033[0m\n"
+printf "\033[34;1mVersion: $OPENWRT_RELEASE\033[0m\n"
 printf "\033[34;1mDate: $(date)\033[0m\n"
 
-VERSION_ID=$(grep VERSION_ID /etc/os-release | awk -F '"' '{print $2}' | awk -F. '{print $1}')
+VERSION_ID=$(cat $VERSION | awk -F. '{print $1}')
 RAM=$(free -m | grep Mem: | awk '{print $2}')
 if [[ "$VERSION_ID" -ge 22 && "$RAM" -lt 150000 ]]
 then 
diff --git a/getdomains-install.sh b/getdomains-install.sh
index 0d0be7c..3a6bb2a 100755
--- a/getdomains-install.sh
+++ b/getdomains-install.sh
@@ -894,11 +894,11 @@ add_internal_wg() {
 
 # System Details
 MODEL=$(cat /tmp/sysinfo/model)
-RELEASE=$(grep OPENWRT_RELEASE /etc/os-release | awk -F '"' '{print $2}')
-printf "\033[34;1mModel:$MODEL\033[0m\n"
-printf "\033[34;1mVersion: $RELEASE\033[0m\n"
+source /etc/os-release
+printf "\033[34;1mModel: $MODEL\033[0m\n"
+printf "\033[34;1mVersion: $OPENWRT_RELEASE\033[0m\n"
 
-VERSION_ID=$(grep VERSION_ID /etc/os-release | awk -F '"' '{print $2}' | awk -F. '{print $1}')
+VERSION_ID=$(echo $VERSION | awk -F. '{print $1}')
 
 if [ "$VERSION_ID" -ne 23 ]; then
     printf "\033[31;1mScript only support OpenWrt 23.05\033[0m\n"

From 7177c18ecd2740bb85b472dd8a26121522f4b491 Mon Sep 17 00:00:00 2001
From: Nikita Skryabin <nekit2271@gmail.com>
Date: Thu, 5 Sep 2024 16:36:17 +0300
Subject: [PATCH 3/3] fix: correct VERSION_ID extraction using echo instead of
 cat

---
 getdomains-check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/getdomains-check.sh b/getdomains-check.sh
index 510857e..5489d15 100755
--- a/getdomains-check.sh
+++ b/getdomains-check.sh
@@ -25,7 +25,7 @@ printf "\033[34;1mModel: $MODEL\033[0m\n"
 printf "\033[34;1mVersion: $OPENWRT_RELEASE\033[0m\n"
 printf "\033[34;1mDate: $(date)\033[0m\n"
 
-VERSION_ID=$(cat $VERSION | awk -F. '{print $1}')
+VERSION_ID=$(echo $VERSION | awk -F. '{print $1}')
 RAM=$(free -m | grep Mem: | awk '{print $2}')
 if [[ "$VERSION_ID" -ge 22 && "$RAM" -lt 150000 ]]
 then