1 files changed, 51 insertions, 12 deletions

diff --git a/update_apt-panopticon b/update_apt-panopticon
index b70f4c3..dde18a5 100755
--- a/update_apt-panopticon
+++ b/update_apt-panopticon
@@ -1,16 +1,55 @@
 #!/bin/bash
 
-cd /var/www/html/apt-panopticon/apt-panopticon_cgp
-#git pull > /dev/null
-#chown -R mirrors:www-data *
-cd /var/www/html/apt-panopticon/apt-panopticon
-#git pull > /dev/null
-#chown -R mirrors:www-data *
-
-if [ ! -f apt-panopticon.lock ] ; then
-    rm ../results; ln -s apt-panopticon/results_old ../results
-    flock -n apt-panopticon.lock ./apt-panopticon.lua && rm apt-panopticon.lock
-    rm ../results; ln -s apt-panopticon/results ../results
+PANOPATH="/var/www/html/apt-panopticon"
+#KEEPDAYS=$((2 * 30))
+
+cd ${PANOPATH}/apt-panopticon_cgp
+if [ -d .git ] ; then
+    git pull > /dev/null
+    chown -R www-data:www-data *
+fi
+cd ${PANOPATH}/apt-panopticon
+if [ -d .git ] ; then
+    git pull > /dev/null
+    chown -R www-data:www-data *
+fi
+
+# Check if the lock file still exists.
+if [ -f apt-panopticon.lock ] ; then
+    # Check if it's still running.
+    ps ax -eo pid,args | grep "apt-panopticon.lua" | grep -v "grep apt-panopticon.lua" | while read line ; do touch apt-panopticon.running ; exit ; done
+    if [ -f apt-panopticon.running ] ; then
+        echo "Previous apt-panopticon still running, exiting."
+        echo "Previous apt-panopticon still running, exiting."
+        ./laggers
+        rm apt-panopticon.running
+        exit 1
+    fi
+    echo "Crashed apt-panopticon detected, removing stale lock file."
+    echo "Crashed apt-panopticon detected, removing stale lock file."
+    ./laggers
+    rm apt-panopticon.lock
+fi
+
+# Clean up any mess left over from failed runs.
+find results_* -maxdepth 2 ! -name "pkgmaster.devuan.org" -name "*.*" -type d -print0 | xargs -0rt /bin/rm -fr
+
+if [ "z" != "z${KEEPDAYS}" ] ; then
+    # Remove old results.
+    find . -daystart -maxdepth 2 -name "stamp"            -type f ! -mtime $((0 - ${KEEPDAYS})) -printf "%h\0" | xargs -0rt /bin/rm -fr
+    find . -daystart -maxdepth 2 -name "results_*.tar.xz" -type f ! -mtime $((0 - ${KEEPDAYS})) -print0        | xargs -0rt /bin/rm -f
+    find .           -maxdepth 1 -name "results_*"        -type d -empty -print0                               | xargs -0rt /bin/rm -fr
 fi
 
-#chown -R mirrors:www-data /var/www/html/SledjHamr/apt-panopticon/results
+rm ../results; ln -s apt-panopticon/results_old ../results
+flock -n apt-panopticon.lock ionice -c3 nice -n 19 timeout --kill-after=20.0 --foreground 8.5m ./apt-panopticon.lua && rm apt-panopticon.lock
+if [ -f apt-panopticon.lock ] ; then
+    echo "apt-panopticon timed out."
+    ./laggers
+fi
+rm ../results; ln -s apt-panopticon/results ../results
+
+chown -R www-data:www-data *
+
+# Clean up any mess left over from THIS failed run.
+find results_* -maxdepth 2 ! -name "pkgmaster.devuan.org" -name "*.*" -type d -print0 | xargs -0rt /bin/rm -fr