update docs and scripts

FAQ.md

@@ -41,9 +41,6 @@ Here is a link regarding Debian and Secure Boot:
 
 https://wiki.debian.org/SecureBoot
 
-There is work underway to add Secure Boot support for systems that do not
-have `dkms` available or if a manual installation is desired.
-
 If you are using a basic command line (non-dkms) installation, see the
 following section in the Installation Steps part of the README:
 

Makefile

@@ -1374,20 +1374,8 @@ ifeq ($(CONFIG_PLATFORM_AUTODETECT), y)
 EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
 EXTRA_CFLAGS += -DCONFIG_IOCTL_CFG80211 -DRTW_USE_CFG80211_STA_EVENT
 
-SUBARCH := $(shell uname -m)
+#SUBARCH := $(shell uname -m)
-
+SUBARCH := $(shell uname -m | sed -e "s/i.86/i386/; s/ppc/powerpc/; s/armv.l/arm/; s/aarch64/arm64/; s/riscv.*/riscv/;")
-ifeq ($(SUBARCH), aarch64)
-SUBARCH := arm64
-endif
-
-ifeq ($(SUBARCH), armv7l)
-SUBARCH := arm
-endif
-
-ifeq ($(SUBARCH), armv6l)
-SUBARCH := arm
-endif
-
 ARCH ?= $(SUBARCH)
 
 CROSS_COMPILE ?=

README.md

@@ -152,10 +152,9 @@ adapters.
 Note: If you decide to buy an adapter that is supported by this driver,
 I recommend you search for an adapter that is `single-state and
 single-function`. Multi-function adapters, wifi and bluetooth, can be
-problematic. The rtl8852bu chipset is multi-fuction. The rtl8832bu
+problematic. For advice about single-state and multi-state adapters, 
-chipset is single-function. For advice about single-state and
+click [here](https://github.com/morrownr/USB-WiFi) and look for Main
-multi-state adapters. click [here](https://github.com/morrownr/USB-WiFi)
+Menu item 1.
-and look for Main Menu item 1.
 
 ### Installation Information
 
@@ -326,9 +325,6 @@ sudo apt install -y build-essential dkms git iw
 
 - Option for Fedora
 
-Note: Fedora users should also install `openssl` if secure boot is
-active.
-
 ```
 sudo dnf -y install git dkms kernel-devel
 ```
@@ -406,13 +402,17 @@ compile the kernel that is in use:
 
 Example of bad situation:
 
+```
 gcc 12.1 (used to compile the kernel)
 gcc 10.3 (version of gcc in use)
+```
 
 Example of good situation:
 
+```
 gcc 12.2 (used to compile the kernel)
 gcc 12.1 (version of gcc in use)
+```
 
 To determine the values:
 
@@ -719,6 +719,15 @@ multiport USB extension can be a good idea in cases like this.
 
 -----
 
+To Contribute:
+
+Fork this repository.
+Make your edits.
+TEST THEM!
+Create a pull request.
+
+-----
+
 #### [Go to Main Menu](https://github.com/morrownr/USB-WiFi)
 
 -----

dkms-make.sh

@@ -4,7 +4,7 @@
 #          run from another script.
 
 # SMEM needs to be set here if dkms build is not initiated by install-driver.sh
-SMEM=$(LANG=C free | awk '/Mem:/ { print $2 }')
+SMEM=$(LC_ALL=C free | awk '/Mem:/ { print $2 }')
 
 # sproc needs to be set here if dkms build is not initiated by install-driver.sh
 sproc=$(nproc)

dkms.conf

@@ -4,4 +4,4 @@ BUILT_MODULE_NAME[0]="88x2bu"
 MAKE="./dkms-make.sh"
 CLEAN="'make' clean"
 DEST_MODULE_LOCATION[0]="/updates/dkms"
-AUTOINSTALL="YES"
+AUTOINSTALL="yes"

remove-driver.sh

@@ -28,11 +28,14 @@
 # GNU General Public License for more details.
 
 SCRIPT_NAME="remove-driver.sh"
-SCRIPT_VERSION="20230830"
+SCRIPT_VERSION="20231118"
+
+MODULE_NAME="88x2bu"
 
 DRV_NAME="rtl88x2bu"
 DRV_VERSION="5.13.1"
-MODULE_NAME="88x2bu"
+
+OPTIONS_FILE="${MODULE_NAME}.conf"
 
 #KARCH="$(uname -m)"
 if [ -z "${KARCH+1}" ]; then
@@ -45,7 +48,6 @@ if [ -z "${KVER+1}" ]; then
 fi
 
 MODDESTDIR="/lib/modules/${KVER}/kernel/drivers/net/wireless/"
-OPTIONS_FILE="${MODULE_NAME}.conf"
 
 # check to ensure sudo or su - was used to start the script
 if [ "$(id -u)" -ne 0 ]; then
@@ -116,10 +118,6 @@ fi
 
 # check for and remove all dkms installations with DRV_NAME
 #
-# dkms status [module/module-version] [-k kernel/arch]
-#
-# $ dkms status
-#
 if command -v dkms >/dev/null 2>&1; then
 	dkms status | while IFS="/, " read -r modname modver kerver _dummy; do
 		case "$modname" in *${MODULE_NAME})
@@ -128,7 +126,6 @@ if command -v dkms >/dev/null 2>&1; then
 		esac
 	done
 	RESULT=$?
-#	echo "Result=${RESULT}"
 
 #	 RESULT will be 3 if there are no instances of module to remove
 #	 however we still need to remove various files or the install script