Merge branch 'master' of git.ucc.asn.au:/matches/honours

[matches/honours.git] / update.sh

diff --git a/update.sh b/update.sh
index ab8c9e3..a5409d7 100755 (executable)
--- a/update.sh
+++ b/update.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
 
 # Script to update all the honours stuff on a regular basis
+# Called by cron(8)
+# Sam Moore 2012
 
 # Need to cd to the directory, otherwise nothing will work
 directory="/home/sam/Documents/University/honours/"
@@ -12,10 +14,15 @@ eval $(ssh-agent) 2>/dev/null
 ssh-add /home/sam/.ssh/honours 2>/dev/null
 
 # This bit plots any open data files, so I can remotely view them
-gnuplot="/usr/bin/gnuplot"
-for data in $(lsof | grep interface | grep $(date +%Y) | awk '{print $NF}'); do
-       $gnuplot -e "set term png; set output \"$data.png\"; plot \"$data\" u 1:3 w lp title \"ADC4\", \"$data\" u 1:5 w lp title \"ADC5\""
-done
+# TODO: Magically update all files
+# TODO: Actually label plots properly, you lazy bastard
+# No longer auto plotting stuff, because I don't really check that often, and plots look better done through gnuplot than viewed as pngs
+#plot="/home/sam/Documents/University/honours/research/TCS/plot.sh"
+#for i in $(find . -name "[0-9]*.dat" -mmin -60 -size +5k -print); do 
+#      $plot $i $i.png
+#done
+
+$git pull git.ucc master # This is probably a good thing to do...
 
 $git add update.sh
 $git add papers
@@ -26,10 +33,14 @@ $git add thesis/proposal/*.bib
 $git add thesis/*.tex
 $git add thesis/*.pdf
 $git add thesis/*.bib
-$git add course/semester2
+#$git add course/semester2 # Don't do this; I will be putting lecture videos in this folder!
 
+# This sets a commit message and commits. Commit will only be done if there are changed files.
 fortune="/usr/games/fortune"
-message=$(echo "Testing auto-plotting of stuff."; echo ""; $fortune; echo "")
+message=""
+if [ "$message" == "" ]; then
+       message=$(echo "Automatic commit. $(date)"; echo ""; $fortune; echo "")
+fi
 $git commit -m "$message"
 if [ "$?" == 0 ]; then
        echo "Commit at $(date)" >> commits.log