From 83d61ad0b5eb4f1b143df6927aad3b541d342d53 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 26 Mar 2023 21:33:43 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- mm-scripts.sh | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index 988bbfc..53e4ec8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -38,7 +38,7 @@ MM_SERVICE_PORTS['bazarr']='6767' declare -A MM_UPDATE_REPO MM_UPDATE_REPO['ombi']='Ombi-app' -# MM_UPDATE_REPO['radarr']='radarr' +MM_UPDATE_REPO['radarr']='radarr' MM_UPDATE_REPO['lidarr']='lidarr' MM_UPDATE_REPO['jackett']='jackett' MM_UPDATE_REPO['bazarr']='morpheus65535' diff --git a/mm-scripts.sh b/mm-scripts.sh index 9595ab8..1f1ffe2 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -101,21 +101,26 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf echo -e "${idsCL[Green]}Done${idsCL[Default]}" msg="Starting the VPN Tunnel" + c=0; spc=''; spc1=$((${cw_spc}-${#msg})) + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" "${VPN_START[@]}" >/dev/null 2>&1 sleep 5s else msg="The VPN Tunnel is already running" + c=0; spc=''; spc1=$((${cw_spc}-${#msg})) + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" fi else msg="Verifying the VPN Tunnel" + c=0; spc=''; spc1=$((${cw_spc}-${#msg})) + until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" mmsv='Verifying' fi - c=0; spc=''; spc1=$((${cw_spc}-${#msg})) - until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done - echo -en "${idsCL[LightCyan]}${msg}${spc} ${idsCL[White]}: ${idsCL[Default]}" - [ $VERBOSE = true ] && echo "$(date) - ${mmsv} VPN..." >> $logfile @@ -337,6 +342,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf echo -e "${idsCL[Red]}${msg}${idsCL[Default]}" echo "$(date) - ${msg}" >> $logfile SENDNOTICE "${srvc^} Service Issue" "${msg}" 1 + tryupdate="true" msg="Updating ${srvc^} Service" @@ -347,7 +353,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/${VPN_INTERFACE}.conf rm -f ${MMFOLDER}/mm.${srvc}.starting else - touch ${MMFOLDER}/mm.${srvc}.starting + [ "${MM_UPDATE_REPO[$srvc]}" != "" ] && touch ${MMFOLDER}/mm.${srvc}.starting fi checkport="go"