From de16766d0384308fe80b318ea5f9588ac4128188 Mon Sep 17 00:00:00 2001
From: morrownr <morrownr@gmail.com>
Date: Tue, 17 Jan 2023 09:49:57 -0600
Subject: [PATCH] tweaks to low mem fix

---
 dkms-make.sh      | 12 ++++++------
 install-driver.sh | 14 +++++++++-----
 remove-driver.sh  |  2 +-
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dkms-make.sh b/dkms-make.sh
index 6e8b96e..c571ad8 100755
--- a/dkms-make.sh
+++ b/dkms-make.sh
@@ -1,21 +1,21 @@
-#!/bin/sh
+#!/bin/bash
 
 # SMEM needs to be set here if dkms build is not initiated by install-driver.sh
 SMEM=$(LANG=C free | awk '/Mem:/ { print $2 }')
 
-# SPROC needs to be set here if dkms build is not initiated by install-driver.sh
-SPROC=$(nproc)
+# sproc needs to be set here if dkms build is not initiated by install-driver.sh
+sproc=$(nproc)
 
 # Avoid Out of Memory condition in low-RAM systems by limiting core usage.
-if [ "$SPROC" -gt 1 ]
+if [ "$sproc" -gt 1 ]
 then
 	if [ "$SMEM" -lt 1400000 ]
 	then
-		SPROC=2
+		sproc=2
 	fi
 fi
 
 kernelver=${kernelver:-$(uname -r)}
-make "-j$SPROC" "KVER=$kernelver" "KSRC=/lib/modules/$kernelver/build"
+make "-j$sproc" "KVER=$kernelver" "KSRC=/lib/modules/$kernelver/build"
 
 exit 0
diff --git a/install-driver.sh b/install-driver.sh
index 8f20731..7f71b2d 100755
--- a/install-driver.sh
+++ b/install-driver.sh
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 SCRIPT_NAME="install-driver.sh"
-SCRIPT_VERSION="20230114"
+SCRIPT_VERSION="20230116"
 MODULE_NAME="8821cu"
 DRV_VERSION="5.12.0.4"
 
@@ -29,7 +29,7 @@ DRV_DIR="$(pwd)"
 OPTIONS_FILE="${MODULE_NAME}.conf"
 
 SMEM=$(LANG=C free | awk '/Mem:/ { print $2 }')
-SPROC=$(nproc)
+sproc=$(nproc)
 
 # check to ensure sudo was used
 if [[ $EUID -ne 0 ]]
@@ -116,6 +116,8 @@ do
 	shift
 done
 
+echo ": ---------------------------"
+
 # displays script name and version
 echo ": ${SCRIPT_NAME} v${SCRIPT_VERSION}"
 
@@ -128,15 +130,15 @@ echo ": ${KARCH} (ARCH)"
 echo ": ${SMEM} (SMEM)"
 
 # Avoid Out of Memory condition in low-RAM systems by limiting core usage.
-if [ "$SPROC" -gt 1 ]
+if [ "$sproc" -gt 1 ]
 then
 	if [ "$SMEM" -lt 1400000 ]
 	then
-		SPROC=2
+		sproc=2
 	fi
 fi
 # display total number of cpu cores / in use
-echo ": ${SPROC}/$(nproc) (SPROC/NPROC)"
+echo ": ${sproc}/$(nproc) (sproc/nproc)"
 
 # display kernel version
 echo ": ${KVER} (KVER)"
@@ -159,6 +161,8 @@ then
 	echo ": "${sb_state}
 fi
 
+echo ": ---------------------------"
+
 # display ISO 3166-1 alpha-2 Country Code
 #a2_country_code=$(iw reg get | grep -i country)
 #echo "Country:  "${a2_country_code}
diff --git a/remove-driver.sh b/remove-driver.sh
index f854a97..aa72c6b 100755
--- a/remove-driver.sh
+++ b/remove-driver.sh
@@ -16,7 +16,7 @@
 # GNU General Public License for more details.
 
 SCRIPT_NAME="remove-driver.sh"
-SCRIPT_VERSION="20230114"
+SCRIPT_VERSION="20230116"
 MODULE_NAME="8821cu"
 DRV_VERSION="5.12.0.4"