From 536c6864a0e74135d37a1db3698399bafafc1391 Mon Sep 17 00:00:00 2001
From: Dan <danb35@gmail.com>
Date: Fri, 23 Apr 2021 06:55:34 -0400
Subject: [PATCH] Update xcaddy build command

---
 caddy-jail.sh | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 caddy-jail.sh

diff --git a/caddy-jail.sh b/caddy-jail.sh
old mode 100755
new mode 100644
index e722d8b..9f24552
--- a/caddy-jail.sh
+++ b/caddy-jail.sh
@@ -117,18 +117,14 @@ iocage fstab -a "${JAIL_NAME}" "${INCLUDES_PATH}" /mnt/includes nullfs rw 0 0
 #####
 
 # Build xcaddy, use it to build Caddy
-if ! iocage exec "${JAIL_NAME}" "go get -u github.com/caddyserver/xcaddy/cmd/xcaddy"
+if ! iocage exec "${JAIL_NAME}" "go install github.com/caddyserver/xcaddy/cmd/xcaddy@latest"
 then
-  echo "Failed to get xcaddy, terminating."
-  exit 1
-fi
-if ! iocage exec "${JAIL_NAME}" go build -o /usr/local/bin/xcaddy github.com/caddyserver/xcaddy/cmd/xcaddy
-then
-  echo "Failed to build xcaddy, terminating."
+  echo "Failed to install xcaddy, terminating."
   exit 1
 fi
+iocage exec "${JAIL_NAME}" mv /root/go/bin/xcaddy /usr/local/bin/xcaddy
 if [ -n "${DNS_PLUGIN}" ]; then
-  if ! iocage exec "${JAIL_NAME}" xcaddy build master --output /usr/local/bin/caddy --with github.com/caddy-dns/"${DNS_PLUGIN}"
+  if ! iocage exec "${JAIL_NAME}" xcaddy build --output /usr/local/bin/caddy --with github.com/caddy-dns/"${DNS_PLUGIN}"
   then
     echo "Failed to build Caddy with ${DNS_PLUGIN} plugin, terminating."
     exit 1