Merge pull request #16 (chore)

chore: update to darvaza.org/core@v0.15.0 and fix `make tidy`

go.mod

@@ -5,13 +5,13 @@ go 1.21
 toolchain go1.22.6
 
 require (
-	darvaza.org/core v0.14.10
-	darvaza.org/x/web v0.8.7
+	darvaza.org/core v0.15.0
+	darvaza.org/x/web v0.9.0
 )
 
 require (
 	darvaza.org/x/fs v0.3.3 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
-	golang.org/x/net v0.29.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
+	golang.org/x/net v0.30.0 // indirect
+	golang.org/x/text v0.19.0 // indirect
 )

go.sum

@@ -1,12 +1,12 @@
-darvaza.org/core v0.14.10 h1:qUakYdmNGgkrpnP2Lg51kfSp9PRdXEwnsTDuAgrFQBo=
-darvaza.org/core v0.14.10/go.mod h1:KCXKssntfqEfuzJa6KMa7F1ShU/lYh1TKt2f4cmEdO0=
+darvaza.org/core v0.15.0 h1:9BCUOH3Evu7l4KzqSr49AgQHw9hQSckYVzTkaa3bOB0=
+darvaza.org/core v0.15.0/go.mod h1:pXwSuJ8r20wSBOS8s5QfhkI2UvRSZgriwYtSIa+fojs=
 darvaza.org/x/fs v0.3.3 h1:EXMgutKhk0fljRlDCkJb7RrbMJRhyfnO41h7bxchAFs=
 darvaza.org/x/fs v0.3.3/go.mod h1:BJBKXHolO5w7up9jqQLk8iLVtmubjUCx3Qp6K0aw9cg=
-darvaza.org/x/web v0.8.7 h1:DZZZ08b6yI52DnE5dOcxGdyVKPHZTRWSLRSlQXqYERA=
-darvaza.org/x/web v0.8.7/go.mod h1:hPUlDXU8Y03uaS19D+MGW4HBCk+6BWbOYxH4LufF4HM=
+darvaza.org/x/web v0.9.0 h1:rRuBBWsDIEke/Lz103xSaOEexthV3d3rH819cpToUPA=
+darvaza.org/x/web v0.9.0/go.mod h1:/70XesLvmRQFb7Vr0YhlAkwh/FG6eZvf6eANy1ayQKw=
 github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
 github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8=
-golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
-golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
-golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
+golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
+golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
+golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
+golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=

internal/build/gen_mk.sh

@@ -106,7 +106,7 @@ EOT
 
 gen_make_targets() {
 	local cmd="$1" name="$2" dir="$3" mod="$4" deps="$5"
-	local call= callu= callx=
+	local call= callu=
 	local depsx=
 	local sequential=
 
@@ -158,7 +158,7 @@ gen_make_targets() {
 	build)
 		# special build flags for cmd/*
 		#
-		callx="$(cat <<-EOL | packed_oneline
+		call="$(cat <<-EOL | packed_oneline
 		set -e
 		MOD="\$\$(\$(GO) list -f '{{.ImportPath}}' ./...)"
 		if echo "\$\$MOD" | grep -q -e '.*/cmd/[^/]\+\$\$'; then
@@ -174,12 +174,9 @@ gen_make_targets() {
 		#
 		exclude=$(gen_revive_exclude "$dir")
 		if [ -n "$exclude" ]; then
-			callx=$(echo "$call" | sed -e "s;\(REVIVE)\);\1 $exclude;")
+			call=$(echo "$call" | sed -e "s;\(REVIVE)\);\1 $exclude;")
 		fi
 		;;
-	*)
-		callx="$call"
-		;;
 	esac
 
 
@@ -196,10 +193,10 @@ EOT
 		# unconditionally
 		echo "$callu" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|"
 	fi
-	if [ -n "$callx" ]; then
+	if [ -n "$call" ]; then
 		# only if there are files
 		echo "ifneq (\$($files),)"
-		echo "$callx" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|"
+		echo "$call" | sed -e "/^$/d;" -e "s|^|\t\$(Q) $cd|"
 		echo "endif"
 	fi
 }