From 63c7790782ee3e7d97b0b6deac5b0f453b8a82d3 Mon Sep 17 00:00:00 2001 From: Bruno21 Date: Sat, 2 Nov 2024 11:18:27 +0100 Subject: [PATCH] Clean code and anonymise --- urls_check.sh | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/urls_check.sh b/urls_check.sh index b03789a..72cbf82 100755 --- a/urls_check.sh +++ b/urls_check.sh @@ -39,21 +39,24 @@ dotenv () { # shellcheck disable=SC1091 [ -f "$HOME/.env" ] && . "$HOME/.env" || echo -e "${red}\nNo .env file found ! Could'nt get update from Github or send notification.'.${reset}" set +a + # + # Gotify: $GOTIFY_SERVER (server url), $GOTIFY_BASH (token) + # Pushover: $USER_KEY$ (user) $BASH_APP (token) } dotenv ### Variables for self updating ScriptArgs=( "$@" ) -ScriptPath="$(readlink -f "$0")" # /Users/bruno/Documents/Scripts/bashbirds/bashbirds.sh -ScriptWorkDir="$(dirname "$ScriptPath")" # /Users/bruno/Documents/Scripts/bashbirds +ScriptPath="$(readlink -f "$0")" +ScriptWorkDir="$(dirname "$ScriptPath")" send_gotify_notification() { # Enabled HSTS & created default WebSocket records in the DSM 7.2 reverse proxy window and it solved itself. now=$(date +"%d-%m-%Y %T") - gotify_server="https://gotify.maboiteverte.fr" + gotify_server="$GOTIFY_SERVER" gotify_token="$GOTIFY_BASH" TITLE="$1" MESSAGE="$2" @@ -112,7 +115,6 @@ display_help() { echo -e "https://www.domain2.com" echo -e "${italic}Add a # to ignore url${reset}" echo - # echo some stuff here for the -a or --add-options exit 1 } @@ -163,7 +165,6 @@ if [[ $url =~ $regex ]]; then else # Chargement de la liste des urls depuis urls_list.txt - while read -r line do [ ${line:0:1} != "#" ] && urls+=("$line") @@ -188,7 +189,6 @@ else echo "Domain like drive.photos-nas.ovh won't be checked.'" fi - # Tri du tableau d'urls IFS=$'\n' sorted=($(sort <<<"${urls[*]}")) @@ -196,8 +196,8 @@ else fi -# On efface la liste des urls down +# On efface la liste des urls down [ -f "./urls_down_list_curl.txt" ] && rm "./urls_down_list_curl.txt" [ -f "./certificats_outdated.txt" ] && rm "./certificats_outdated.txt" @@ -330,12 +330,10 @@ if [ -f "./urls_down_list_curl.txt" ]; then if [ "$notif" == "gotify" ];then msg_md="$url_down" - # MESSAGE="**A new version of Pi-hole is available:**\n\n $msg_md\n\n $infos\n\n Please run *pihole -up* on $host to update !" send_gotify_notification "Several url are down !" "$msg_md" elif [ "$notif" == "pushover" ];then msg_html="$url_down" send_pushover_notification "Several url are down !" "$msg_html" - #pushover -a "bash" -m "A new version of Pi-hole is available:
$msg_html
$infos_html
Please run pihole -up on $host to update" -p 2 -f 1 fi else @@ -353,16 +351,13 @@ if [ -f "./certificats_outdated.txt" ]; then if [ "$notif" == "gotify" ];then msg_md="$certif_outdated" - # MESSAGE="**A new version of Pi-hole is available:**\n\n $msg_md\n\n $infos\n\n Please run *pihole -up* on $host to update !" send_gotify_notification "Several certificats are outdated !" "$msg_md" elif [ "$notif" == "pushover" ];then msg_html="$certif_outdated" send_pushover_notification "Several certificats are outdated !" "$msg_html" - #pushover -a "bash" -m "A new version of Pi-hole is available:
$msg_html
$infos_html
Please run pihole -up on $host to update" -p 2 -f 1 fi else echo -e "${green}\nNo certificat outdated !${reset}" fi -# curl --write-out "%{json}" https://nextcloud.photos-nas.ovh | jq