Merge remote-tracking branch 'upstream/main'

install/caddy-install.sh

@@ -18,12 +18,7 @@ $STD apt-get install -y \
   debian-keyring \
   debian-archive-keyring \
   apt-transport-https \
-  gpg \
-  curl \
-  sudo \
-  mc \
-  wget \
-  openssh-server
+  gpg
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Caddy"
@@ -38,8 +33,8 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
   msg_info "Installing Golang"
   set +o pipefail
   temp_file=$(mktemp)
-  golang_tarball=$(curl -s https://go.dev/dl/ | grep -oP 'go[\d\.]+\.linux-arm64\.tar\.gz' | head -n 1)
-  wget -q https://golang.org/dl/"$golang_tarball" -O "$temp_file"
+  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"
@@ -47,9 +42,10 @@ if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
   msg_ok "Installed Golang"
 
   msg_info "Setup xCaddy"
+  $STD apt-get install -y git
   cd /opt
-  RELEASE=$(curl -s https://api.github.com/repos/caddyserver/xcaddy/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3) }')
-  wget -q https://github.com/caddyserver/xcaddy/releases/download/${RELEASE}/xcaddy_${RELEASE:1}_linux_arm64.deb
+  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")
   $STD dpkg -i xcaddy_${RELEASE:1}_linux_arm64.deb
   rm -rf /opt/xcaddy*
   $STD xcaddy build