diff --git a/mm-scripts.sh b/mm-scripts.sh index b7d13a8..a7a6fb1 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -45,38 +45,30 @@ MMCRONCHECK(){ [ ${#OUT} = 0 ] && /bin/ip route add default via ${DEFAULT_GW} fi - # if [ $(date +%u) -eq 4 ] && [ $(date +%H)$(date +%M) -ge 0400 ] && [ $(date +%H)$(date +%M) -le 0405 ] ; then - if [ $(date +%u) -eq 5 ] && [ $(date +%H)$(date +%M) -ge 1925 ] && [ $(date +%H)$(date +%M) -le 1950 ] ; then + if [ $(date +%u) -eq 6 ] && [ $(date +%H)$(date +%M) -ge 0400 ] && [ $(date +%H)$(date +%M) -le 0405 ] ; then echo "update services crontask triggered" if [ $(expr `date +%s` - $(stat -c %Y ${TMPFOLDER}/vers.info)) -gt 600 ]; then - echo "updating services executing" - /usr/local/bin/mm update service all ${1} >/dev/null 2>&1 + UPDATESERVICE service all q >/dev/null 2>&1 echo "$(date) - Updated All Services" >> $logfile - else - echo "not updating" fi - # elif [ $(date +%u) -eq 5 ] && [ $(date +%H)$(date +%M) -ge 1925 ] && [ $(date +%H)$(date +%M) -le 1930 ] ; then - elif [ $(date +%H)$(date +%u) -eq 3 ] && [ $(date +%H)$(date +%M) -ge 0300 ] && [ $(date +%H)$(date +%M) -lt 0305 ] ; then + elif [ $(date +%H)$(date +%u) -eq 6 ] && [ $(date +%H)$(date +%M) -ge 0300 ] && [ $(date +%H)$(date +%M) -lt 0305 ] ; then echo "update mm crontask triggered" if [ $(expr `date +%s` - $(stat -c %Y ${MMFOLDER}/.git/ORIG_HEAD)) -gt 600 ] && [ "`git -C /opt/idssys/nodemgmt log --pretty=%H ...refs/heads/${GBRANCH}^ | head -n 1`" != "`git -C /opt/idssys/nodemgmt ls-remote origin -h refs/heads/${GBRANCH} |cut -f1`" ]; then echo "updating mm executing" /usr/local/bin/mm update q >/dev/null 2>&1 source /opt/idssys/mediamanager/defaults.inc echo "$(date) - Updated MM Scripts to v${VERS}" >> $logfile - else - echo "not updating" fi - else - echo "no scheduled tasks" + fi - # if [ -f ${TMPFOLDER}/mm.stop ]; then - # /usr/local/bin/mm check q >/dev/null 2>&1 - # else - # echo -e "$(date) - Starting log #############################" >> ${outputlogfile} - # /usr/local/bin/mm check q >> ${outputlogfile} - # echo -e "$(date) - Finished log #############################" >> ${outputlogfile} - # fi + if [ -f ${TMPFOLDER}/mm.stop ]; then + /usr/local/bin/mm check q >/dev/null 2>&1 + else + echo -e "$(date) - Starting log #############################" >> ${outputlogfile} + /usr/local/bin/mm check q >> ${outputlogfile} + echo -e "$(date) - Finished log #############################" >> ${outputlogfile} + fi exit 0 }