X-Git-Url: https://git.ucc.asn.au/?p=matches%2Fhonours.git;a=blobdiff_plain;f=update.sh;h=a5409d70624c6ec55627e31dcf3e0aa3809699f1;hp=0eeb1155f7a6b32b447396cdfc370a1f01e48784;hb=66ef7590cb47f237f793079dd4689c8a2941498c;hpb=bb0d2b761bd6986a18a6d0aec13eccb8ebbb9dab

diff --git a/update.sh b/update.sh
index 0eeb1155..a5409d70 100755
--- a/update.sh
+++ b/update.sh
@@ -1,30 +1,50 @@
 #!/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/"
 cd "$directory" 
 
 # Need to do this too. Apparently
-##eval `ssh-agent -s`
-
-echo "Committing at $(date)" >> commits.log
-git add update.sh
-git add papers
-git add research
-git add thesis/proposal/*.tex
-git add thesis/proposal/*.pdf
-git add thesis/proposal/*.bib
-git add thesis/*.tex
-git add thesis/*.pdf
-git add thesis/*.bib
-git add course/semester2
-
-
-git commit -m "Automatic commit at $(date)"
+git="/usr/bin/git"
+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
+# 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
+$git add research
+$git add thesis/proposal/*.tex
+$git add thesis/proposal/*.pdf
+$git add thesis/proposal/*.bib
+$git add thesis/*.tex
+$git add thesis/*.pdf
+$git add thesis/*.bib
+#$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=""
+if [ "$message" == "" ]; then
+	message=$(echo "Automatic commit. $(date)"; echo ""; $fortune; echo "")
+fi
+$git commit -m "$message"
 if [ "$?" == 0 ]; then
-	git push git.ucc 2>&1 >> commits.log
+	echo "Commit at $(date)" >> commits.log
+	$git push git.ucc 2>&1 >> commits.log
 fi
 
-#kill $SSH_AGENT_PID
+kill -9 $SSH_AGENT_PID