From fcc33fb2b2b7dd27ee2f75cbb7851b01cbeebd64 Mon Sep 17 00:00:00 2001 From: CanbiZ <47820557+MickLesk@users.noreply.github.com> Date: Wed, 21 May 2025 14:38:32 +0200 Subject: [PATCH] fix some things --- ct/cloudflare-ddns.sh | 16 ++++---- install/cloudflare-ddns-install.sh | 63 ++++++++++++------------------ 2 files changed, 32 insertions(+), 47 deletions(-) diff --git a/ct/cloudflare-ddns.sh b/ct/cloudflare-ddns.sh index 84a5b4e2..e1f0b483 100644 --- a/ct/cloudflare-ddns.sh +++ b/ct/cloudflare-ddns.sh @@ -20,15 +20,15 @@ color catch_errors function update_script() { - header_info - check_container_storage - check_container_resources - if [[ ! -f /etc/systemd/system/cloudflare-ddns.service ]]; then - msg_error "No ${APP} Installation Found!" - exit - fi - msg_error "There is no update function for ${APP}." + header_info + check_container_storage + check_container_resources + if [[ ! -f /etc/systemd/system/cloudflare-ddns.service ]]; then + msg_error "No ${APP} Installation Found!" exit + fi + msg_error "There is no update function for ${APP}." + exit } start diff --git a/install/cloudflare-ddns-install.sh b/install/cloudflare-ddns-install.sh index e9384873..f4268d11 100644 --- a/install/cloudflare-ddns-install.sh +++ b/install/cloudflare-ddns-install.sh @@ -13,21 +13,7 @@ setting_up_container network_check update_os -msg_info "Installing dependencies" install_go -msg_ok "Installed dependencies" - -# msg_info "Installing Go" -# GO_VERSION=$(curl -s https://go.dev/VERSION?m=text | grep -m1 '^go') -# GO_TARBALL="${GO_VERSION}.linux-amd64.tar.gz" -# GO_URL="https://go.dev/dl/${GO_TARBALL}" -# INSTALL_DIR="/usr/bin" -# rm -rf "${INSTALL_DIR}/go" -# curl -LO "$GO_URL" -# tar -C "$INSTALL_DIR" -xzf "$GO_TARBALL" -# echo 'export PATH=$PATH:/usr/bin/go/bin' >>~/.bashrc -# source ~/.bashrc -# msg_ok "Installed Go" msg_info "Configure Application" var_cf_api_token="default" @@ -38,33 +24,33 @@ read -rp "Enter the domains separated with a comma (*.example.org,www.example.or var_cf_proxied="false" while true; do - read -rp "Proxied? (y/n): " answer - case "$answer" in - [Yy]*) - var_cf_proxied="true" - break - ;; - [Nn]*) - var_cf_proxied="false" - break - ;; - *) echo "Please answer y or n." ;; - esac + read -rp "Proxied? (y/n): " answer + case "$answer" in + [Yy]*) + var_cf_proxied="true" + break + ;; + [Nn]*) + var_cf_proxied="false" + break + ;; + *) echo "Please answer y or n." ;; + esac done var_cf_ip6_provider="none" while true; do - read -rp "Enable IPv6 support? (y/n): " answer - case "$answer" in - [Yy]*) - var_cf_ip6_provider="auto" - break - ;; - [Nn]*) - var_cf_ip6_provider="none" - break - ;; - *) echo "Please answer y or n." ;; - esac + read -rp "Enable IPv6 support? (y/n): " answer + case "$answer" in + [Yy]*) + var_cf_ip6_provider="auto" + break + ;; + [Nn]*) + var_cf_ip6_provider="none" + break + ;; + *) echo "Please answer y or n." ;; + esac done msg_ok "Configured Application" @@ -98,5 +84,4 @@ customize msg_info "Cleaning up" $STD apt-get -y autoremove $STD apt-get -y autoclean -#rm -f "$GO_TARBALL" msg_ok "Cleaned"