diff --git a/README.md b/README.md index e605921..7f671d8 100644 --- a/README.md +++ b/README.md @@ -281,6 +281,12 @@ sudo dnf -y install git dkms kernel-devel kernel-debug-devel sudo zypper install -t pattern devel_kernel dkms ``` +- Option for Alpine + +``` +sudo apk add linux-lts-dev make gcc +``` + - Option for Void Linux ``` diff --git a/dkms.conf b/dkms.conf index 999a3d5..9136986 100644 --- a/dkms.conf +++ b/dkms.conf @@ -4,3 +4,4 @@ MAKE[0]="'make' -j$(nproc) KVER=${kernelver} KSRC=/lib/modules/${kernelver}/buil CLEAN="'make' clean" BUILT_MODULE_NAME[0]="88x2bu" DEST_MODULE_LOCATION[0]="/kernel/drivers/net/wireless" +AUTOINSTALL="yes" diff --git a/install-driver.sh b/install-driver.sh index 23cc588..1fcf1ba 100755 --- a/install-driver.sh +++ b/install-driver.sh @@ -5,7 +5,7 @@ # Supports dkms and non-dkms installations. SCRIPT_NAME="install-driver.sh" -SCRIPT_VERSION="20221204" +SCRIPT_VERSION="20221205" MODULE_NAME="88x2bu" DRV_VERSION="5.13.1" OPTIONS_FILE="${MODULE_NAME}.conf" @@ -19,7 +19,8 @@ DRV_NAME="rtl${MODULE_NAME}" DRV_DIR="$(pwd)" # Some distros have a non-mainlined, patched-in kernel driver -# that has to be deactivated. +# that has to be deactivated. The filename may need to change +# when the new in-kernel driver is mainlined. BLACKLIST_FILE="rtw88_8822bu.conf" # check to ensure sudo was used @@ -30,6 +31,15 @@ then exit 1 fi +# check to ensure iw is installed +if ! command -v iw >/dev/null 2>&1 +then + echo "A required package appears to not be installed." + echo "Please install the following package: iw" + echo "Once the package is installed, please run \"sudo ./${SCRIPT_NAME}\"" + exit 1 +fi + # check to ensure mokutil is installed if ! command -v mokutil >/dev/null 2>&1 then @@ -57,15 +67,6 @@ then exit 1 fi -# check to ensure iw is installed -if ! command -v iw >/dev/null 2>&1 -then - echo "A required package appears to not be installed." - echo "Please install the following package: iw" - echo "Once the package is installed, please run \"sudo ./${SCRIPT_NAME}\"" - exit 1 -fi - # support for the NoPrompt option allows non-interactive use of this script NO_PROMPT=0 @@ -98,16 +99,21 @@ fi # information that helps with bug reports -# kernel +# display kernel version echo "Linux Kernel=${KVER}" -# architecture - for ARM: aarch64 = 64 bit, armv7l = 32 bit +# display architecture echo "CPU Architecture=${KARCH}" -# gcc version +# display gcc version gcc_ver=$(gcc --version | grep -i gcc) echo "gcc --version="${gcc_ver} +# display ISO 3166-1 alpha-2 Country Code +# https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2 +a2_country_code=$(iw reg get | grep -i country) +echo "Country Code=="${a2_country_code} + # check for secure mode # @@ -232,12 +238,14 @@ fi if [ $NO_PROMPT -ne 1 ] then read -p "Do you want to edit the driver options file now? [y/N] " -n 1 -r + echo if [[ $REPLY =~ ^[Yy]$ ]] then nano /etc/modprobe.d/${OPTIONS_FILE} fi read -p "Do you want to reboot now? (recommended) [y/N] " -n 1 -r + echo if [[ $REPLY =~ ^[Yy]$ ]] then reboot