Merge remote-tracking branch 'upstream/main'

install/caddy-install.sh

@@ -17,8 +17,7 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y \
   debian-keyring \
   debian-archive-keyring \
-  apt-transport-https \
-  gpg
+  apt-transport-https
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Caddy"
@@ -30,22 +29,12 @@ msg_ok "Installed Caddy"
 
 read -r -p "${TAB3}Would you like to install xCaddy Addon? <y/N> " prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
-  msg_info "Installing Golang"
-  set +o pipefail
-  temp_file=$(mktemp)
-  golang_tarball=$(curl -fsSL https://go.dev/dl/ | grep -oP 'go[\d\.]+\.linux-arm64\.tar\.gz' | head -n 1)
-  curl -fsSL "https://golang.org/dl/${golang_tarball}" -o "$temp_file"
-  tar -C /usr/local -xzf "$temp_file"
-  ln -sf /usr/local/go/bin/go /usr/local/bin/go
-  rm -f "$temp_file"
-  set -o pipefail
-  msg_ok "Installed Golang"
-
+  install_go
   msg_info "Setup xCaddy"
   $STD apt-get install -y git
   cd /opt
   RELEASE=$(curl -fsSL https://api.github.com/repos/caddyserver/xcaddy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  curl -fsSL "https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_arm64.deb" -o $(basename "https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_arm64.deb")
+  curl -fsSL "https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_arm64.deb" -o "xcaddy_${RELEASE:1}_linux_arm64.deb"
   $STD dpkg -i xcaddy_"${RELEASE:1}"_linux_arm64.deb
   rm -rf /opt/xcaddy*
   $STD xcaddy build