diff --git a/.gitignore b/.gitignore index 453273535664e2902a743a6e6132d6443589699d..b5b27b6c035eccd58a4c16a6d3a9760b38bb5c4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +*.changes *.deb maharadocs-1.5/debian/files maharadocs-1.5/debian/maharadocs.debhelper.log diff --git a/maharadocs-1.7/debian/changelog b/maharadocs-1.7/debian/changelog index 1e8e8d9342aa65dcbfd29022e78c354653cb3ceb..2135312ace63c6d7ff32aeea83f4fbd05de34ffb 100644 --- a/maharadocs-1.7/debian/changelog +++ b/maharadocs-1.7/debian/changelog @@ -1,3 +1,11 @@ +maharadocs (16.10-1) stable; urgency=medium + + * Move old versions of manuals from daily to monthly cron. + * New cron job in /etc/cron.monthly to build old versions. + * Adds a timestamp to the log. + + -- Jonathan Harker Thu, 13 Oct 2016 12:57:31 +1300 + maharadocs (15.04-4) stable; urgency=medium * Adding generation for 15.10 diff --git a/maharadocs-1.7/debian/maharadocs.cron.daily b/maharadocs-1.7/debian/maharadocs.cron.daily old mode 100644 new mode 100755 index ece051fa358dc60bc2f9454c9152838395cd2bd9..c31c23f9d5d06118ddc0e4afc903e6ba850af134 --- a/maharadocs-1.7/debian/maharadocs.cron.daily +++ b/maharadocs-1.7/debian/maharadocs.cron.daily @@ -11,15 +11,14 @@ LOGDIR=$RET LOGFILE=${LOGDIR}/update.log cd $INSTALLDIR + +# Add a useful timestamp +echo ==================================== >> $LOGFILE +date '+%Y-%m-%d %H:%M:%S %Z' >> $LOGFILE +echo ==================================== >> $LOGFILE + git pull >> $LOGFILE -make -C $INSTALLDIR update html epub MAHARA=1.4 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=1.5 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=1.6 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=1.7 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=1.8 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=1.9 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=1.10 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=15.04 >> $LOGFILE 2>&1 -make -C $INSTALLDIR update html epub MAHARA=15.10 >> $LOGFILE 2>&1 + +# Move old versions to the monthly cron in /etc/cron.monthly/ make -C $INSTALLDIR update html epub MAHARA=16.04 >> $LOGFILE 2>&1 make -C $INSTALLDIR update html epub MAHARA=16.10 >> $LOGFILE 2>&1 diff --git a/maharadocs-1.7/debian/maharadocs.cron.monthly b/maharadocs-1.7/debian/maharadocs.cron.monthly new file mode 100755 index 0000000000000000000000000000000000000000..a952f15b81fa03aed153180871370d7d146f693a --- /dev/null +++ b/maharadocs-1.7/debian/maharadocs.cron.monthly @@ -0,0 +1,31 @@ +#!/bin/bash +set -e +export DEBIAN_FRONTEND=noninteractive +. /usr/share/debconf/confmodule +PACKAGE=`basename $0 .postinst` + +db_get maharadocs/installdir +INSTALLDIR=$RET +db_get maharadocs/logdir +LOGDIR=$RET +LOGFILE=${LOGDIR}/update.log + +cd $INSTALLDIR + +# Add a useful timestamp +echo ==================================== >> $LOGFILE +echo Monthly run >> $LOGFILE +date '+%Y-%m-%d %H:%M:%S %Z' >> $LOGFILE +echo ==================================== >> $LOGFILE + +git pull >> $LOGFILE + +make -C $INSTALLDIR update html epub MAHARA=1.4 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=1.5 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=1.6 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=1.7 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=1.8 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=1.9 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=1.10 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=15.04 >> $LOGFILE 2>&1 +make -C $INSTALLDIR update html epub MAHARA=15.10 >> $LOGFILE 2>&1