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"