From 7074ae43a449d2235b364a0cfec85b993da51fa7 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sun, 23 Feb 2025 15:38:10 -0600 Subject: [PATCH] update --- defaults.inc | 2 +- mm-scripts.sh | 11 ++--------- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/defaults.inc b/defaults.inc index 6e4ddf9..0ecb9c8 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,6 +1,6 @@ #!/usr/bin/env bash -VERS='3.10.3-02222025' +VERS='3.10.4-02232025' MMFOLDER="/opt/idssys/mediamanager" TMPFOLDER="${MMFOLDER}/.tmp" diff --git a/mm-scripts.sh b/mm-scripts.sh index eee42b5..21f4999 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -5,7 +5,7 @@ action="$1" VERBOSE=true -[ "${action}" != "cron" ] && source /opt/idssys/defaults/colors.inc +[ "${2}" != "q" ] && [ "${2}" != "qq" ] && source /opt/idssys/defaults/colors.inc source /opt/idssys/defaults/default.inc source /opt/idssys/mediamanager/settings.conf source /opt/idssys/mediamanager/defaults.inc @@ -13,13 +13,6 @@ source /opt/idssys/mediamanager/defaults.inc [ -f ${TMPFOLDER}/vers.info ] && source ${TMPFOLDER}/vers.info [ "${GITBRANCH}" != "" ] && GBRANCH="${GITBRANCH}" || GBRANCH="master" -if [ "${2}" == "q" ]; then - unset idsCL idsBG idsST - idsCL=('') - idsBG=('') - idsST=('') -fi - [ -f ${TMPFOLDER}/vpninfo ] && source ${TMPFOLDER}/vpninfo if [[ "${noheader}" != *" ${1} "* ]] && [[ "${noheader}" != *" ${2} "* ]] || ([ "${1}" == "update" ] && [ ! -z ${2+x} ]); then @@ -62,7 +55,7 @@ MMCRONCHECK(){ /usr/local/bin/mm check q >/dev/null 2>&1 else echo -e "$(date) - Starting log #############################" >> ${MM_OUTPUT_LOGFILE} - /usr/local/bin/mm check >> ${MM_OUTPUT_LOGFILE} + /usr/local/bin/mm check qq >> ${MM_OUTPUT_LOGFILE} echo -e "$(date) - Finished log #############################" >> ${MM_OUTPUT_LOGFILE} fi