From 0de4af9bdb757b9c439cfe116b721ce4aaa1d2ee Mon Sep 17 00:00:00 2001
From: bryan <bryanroessler@gmail.com>
Date: Thu, 24 Oct 2024 13:19:00 -0400
Subject: [PATCH] Debug curl checksum issues

---
 openwrtbuilder |  5 +++--
 profiles       | 47 ++++++++++-------------------------------------
 2 files changed, 13 insertions(+), 39 deletions(-)

diff --git a/openwrtbuilder b/openwrtbuilder
index 1d315f4..8e66889 100755
--- a/openwrtbuilder
+++ b/openwrtbuilder
@@ -10,7 +10,7 @@
 #
 
 # Set default release
-: "${RELEASE:="23.05.3"}"
+: "${RELEASE:="23.05.5"}"
 
 printHelp() {
     debug "${FUNCNAME[0]}"
@@ -371,7 +371,7 @@ installDependencies() {
 getImageBuilder() {
     debug "${FUNCNAME[0]}"
 
-    declare url="$1"
+    local url="$1"
 
     if [[ -f "$IB_ARCHIVE" ]]; then
         if askOk "$IB_ARCHIVE exists. Re-download?"; then
@@ -397,6 +397,7 @@ getImageBuilderChecksum() {
         fi
     fi
 
+    echo "Downloading Image Builder checksum using $DL_TOOL"
     execute "$DL_TOOL -o $IB_SHA256_FILE $IB_SHA256_URL"
 }
 
diff --git a/profiles b/profiles
index ec6b6b2..13161bf 100644
--- a/profiles
+++ b/profiles
@@ -7,23 +7,23 @@
 default_packages="\
 	luci \
 	luci-ssl \
+	luci-proto-wireguard \
+	luci-app-statistics \
+	collectd-mod-sensors \
+	collectd-mod-thermal \
+	collectd-mod-conntrack \
+	collectd-mod-cpu \
 	nano \
 	htop \
 	diffutils \
 	tar \
 	iperf3 \
-	bash \
+	zsh \
 	rsync \
-	luci-app-statistics \
-	collectd-mod-sensors \
-	collectd-mod-thermal \
-	collectd-mod-conntrack \
-	collectd-mod-cpu"
+	openssh-sftp-server \
+"
 
-#################
 # Current devices
-#################
-
 # Main router
 declare -Ag r4s
 r4s['device']="friendlyarm_nanopi-r4s"
@@ -31,7 +31,6 @@ r4s['target']="rockchip/armv8"
 r4s['filesystem']="ext4"
 r4s['packages']="\
 	$default_packages \
-	luci-proto-wireguard \
 	luci-app-ddns \
 	luci-app-sqm \
 	irqbalance \
@@ -56,7 +55,7 @@ r4s['config']="\
 r4s['files']="\
 	/mnt/backup"
 
-# WDS mesh nodes
+# Access point
 declare -Ag ax6000
 ax6000['device']="xiaomi_redmi-router-ax6000-stock"
 ax6000['target']="mediatek/filogic"
@@ -68,22 +67,6 @@ ax6000['packages']="\
 	-odhcpd-ipv6only \
 	-nftables \
 	-firewall4"
-	# for 802.11s
-	# mesh11sd \
-	# -wpad-basic-mbedtls \
-	# wpad-mesh-mbedtls"
-
-# WDS mesh nodes
-declare -Ag ax6000_ap
-ax6000_ap['device']="xiaomi_redmi-router-ax6000-stock"
-ax6000_ap['target']="mediatek/filogic"
-ax6000_ap['release']="snapshot"
-ax6000_ap['filesystem']="squashfs"
-ax6000_ap['packages']="\
-	$default_packages \
-	avahi-daemon \
-	smcroute \
-	ca-bundle"
 
 # For converted uboots
 # declare -Ag ax6000_uboot
@@ -107,7 +90,6 @@ n5100['target']="x86/64"
 n5100['filesystem']="squashfs"
 n5100['packages']="\
 	$default_packages \
-	luci-proto-wireguard \
 	luci-app-ddns \
 	irqbalance \
 	collectd-mod-df \
@@ -150,27 +132,20 @@ rpi4['packages']="\
 	kmod-usb-net-asix-ax88179 \
 	kmod-usb-net-rtl8152 \
 	luci-app-upnp \
-	luci-proto-wireguard \
 	luci-app-pbr \
 	-dnsmasq \
 	dnsmasq-full \
 	luci-app-ddns \
 	luci-app-sqm"
 
-
-#################
 # Stock builds
-#################
 declare -Ag r4s_stock
 r4s_stock['device']="friendlyarm_nanopi-r4s"
 r4s_stock['target']="rockchip/armv8"
 r4s_stock['filesystem']="ext4"
 r4s_stock['release']="snapshot"
 
-
-#################
 # Old devices
-#################
 declare -Ag totolink
 totolink['device']="totolink_x5000r"
 totolink['target']="ramips/mt7621"
@@ -213,7 +188,6 @@ r2s['filesystem']="ext4"
 r2s['packages']="\
 	$default_packages \
 	luci-app-upnp \
-	luci-proto-wireguard \
 	luci-app-pbr \
 	-dnsmasq \
 	dnsmasq-full \
@@ -234,7 +208,6 @@ r2s_tr['filesystem']="ext4"
 r2s_tr['packages']="\
 	$default_packages \
 	luci-app-upnp \
-	luci-proto-wireguard \
 	luci-app-pbr \
 	luci-app-ddns \
 	luci-app-statistics \