diff --git a/defaults.inc b/defaults.inc index 4a4a338..e1b5ce3 100755 --- a/defaults.inc +++ b/defaults.inc @@ -41,3 +41,14 @@ DEBUGLOGSTOP(){ chktm=$((chktmend-chktmstart)) echo "$(date) - ${mmsv} Runtime: ${chktm}s" >> $logfile } + +MMUPDATECHECK(){ + if curl -m 15 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then + cd ${MMFOLDER} + if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then + touch ${MMFOLDER}/update.available + fi + else + /bin/rm -f ${MMFOLDER}/update.available + fi +} diff --git a/mm-scripts.sh b/mm-scripts.sh index 5f8d2f5..a0deba5 100755 --- a/mm-scripts.sh +++ b/mm-scripts.sh @@ -306,12 +306,7 @@ PersistentKeepalive = 25" >> /etc/wireguard/wg-torguard.conf fi fi - echo - - if [ "${1}" == "check" ] && [ "$(date +%M)" == "15" ]; then - MMUPDATECHECK - fi - + echo [ $VERBOSE = true ] && DEBUGLOGSTOP @@ -490,17 +485,6 @@ MMSTATUS(){ echo } -MMUPDATECHECK(){ - if curl -m 15 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then - cd ${MMFOLDER} - if [ "`git log --pretty=%H ...refs/heads/master^ | head -n 1`" != "`git ls-remote origin -h refs/heads/master |cut -f1`" ]; then - touch ${MMFOLDER}/update.available - fi - else - /bin/rm -f ${MMFOLDER}/update.available - fi -} - if [ ! -f ${MMFOLDER}/mm.update.stop ]; then if [ -f ${MMFOLDER}/mm.stop ]; then stoppedsince=`date +%s`-$(stat -c %Y ${MMFOLDER}/mm.stop) diff --git a/run.sh b/run.sh index 31eaca5..830915b 100755 --- a/run.sh +++ b/run.sh @@ -11,6 +11,10 @@ else source ${MMFOLDER}/settings.conf fi +if ([ "${1}" == "check" ] && [ "$(date +%M)" == "15" ]) || [ "${1}" == "" ]; then + MMUPDATECHECK +fi + if [ "${1}" == "update" ]; then if curl -m 15 -s --head --request GET https://git.schroedercity.com | grep "HTTP/2 200" > /dev/null; then if [ "${2}" != "q" ]; then