Skip to content

Commit

Permalink
Update wg_manager.sh
Browse files Browse the repository at this point in the history
HOTFIX: WireGuard User-soace Tools never downloaded. (Regression to accommodate RMerlin Alpha release which has it in Firmware) and also correct Kernel module  filename to download for RT-AX86U
  • Loading branch information
MartineauUK committed Dec 16, 2021
1 parent 123dcc4 commit 4f34339
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions wg_manager.sh
Expand Up @@ -24,7 +24,7 @@ VERSION="v4.13"
#

# Maintainer: Martineau
# Last Updated Date: 15-Dec-2021
# Last Updated Date: 16-Dec-2021
#
# Description:
#
Expand Down Expand Up @@ -399,7 +399,7 @@ Download_Modules() {
;;
RT-AX86U|GT-AC5700) # v4.12 These models have wireguard in the firmware
# RT-AX68U, RT-AX86U - 4.1.52 e.g. wireguard-kernel_1.0.20210219-k52_1_aarch64-3.10.ipk
_Get_File "$(echo "$WEBFILE_NAMES" | awk '/k27/ {print}')" "$REPOSITORY_OWNER" "$FROM_REPOSITORY" # k52_1
_Get_File "$(echo "$WEBFILE_NAMES" | awk '/k52/ {print}')" "$REPOSITORY_OWNER" "$FROM_REPOSITORY" # k52_1
;;
*)
echo -e $cBRED"\a\n\t***ERROR: Unable to find 3rd-Party WireGuard Kernel module for $ROUTER (v$BUILDNO)\n"$cRESET
Expand All @@ -424,7 +424,7 @@ Download_Modules() {

# User Space Tools - Allow use of Entware/3rd Party modules even if Modules included in firmware
if [ ! -f /usr/sbin/wg ] || [ "$USE_ENTWARE_KERNEL_MODULE" == "Y" ];then # v4.12 Is the User Space Tools included in the firmware?
if [ "$ROUTER_COMPATIBLE" == "N" ];then # v4.13
if [ "$ROUTER_COMPATIBLE" != "N" ];then # v4.13 HOTFIX
WEBFILE=$(echo "$WEBFILE_NAMES" | awk '/wireguard-tools/ {print}')
echo -e $cBCYA"\n\tDownloading WireGuard User space Tool$cBWHT '$WEBFILE'$cBCYA for $ROUTER (v$BUILDNO) @$REPOSITORY_OWNER $FROM_RESPOSITORY_TXT"$cRESET # v4.11
_Get_File "$WEBFILE" "$REPOSITORY_OWNER" "$FROM_REPOSITORY" "NOMSG" # v4.12 v4.11
Expand Down

0 comments on commit 4f34339

Please sign in to comment.