# HG changeset patch
# User Jim Hague <jim.hague@acm.org>
# Date 1377905928 -3600
# Node ID 502fa2df300ec1ce8692d09a52fd64b87cee3cb4
# Parent  30a9bef6c3e1ab93900b0ac0cb81bf497b3412a8# Parent  e09ff88ab469e756c646458c39fc1e37f8d85bd8
Automated merge with ssh://hg.cryhavoc.org.uk/dottes

diff -r 30a9bef6c3e1 -r 502fa2df300e Library/AstleysRide.abc
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/AstleysRide.abc	Sat Aug 31 00:38:48 2013 +0100
@@ -0,0 +1,7 @@
+X:1
+T:Astley's Ride
+M:4/4
+K:G
+dB|"G"G2G2 G2FG|"D"A2A2 A2BA|"C"GFED E2F2|"G"GABc dcBA|
+G2G2 G2FG|"D"A2A2 A2BA|"C"GFED "D7"E2F2|G4G2::GA|B2B2 B2AB|"Am"c2c2 cdcB|
+"D7"A2A2 A2GA|"G"B2B2 BcBA|G2G2 G2FG|"D"A2A2 A2BA|"C"GFED "D7"E2F2|"G"G4G2:|
diff -r 30a9bef6c3e1 -r 502fa2df300e makeWeb.sh
--- a/makeWeb.sh	Sat Aug 31 00:20:51 2013 +0100
+++ b/makeWeb.sh	Sat Aug 31 00:38:48 2013 +0100
@@ -27,7 +27,6 @@
 tunelist=tunelist.html
 booke=$1
 masterbooke=$2
-masterwebdir=$dir/web/$2
 title=$booke
 instrument=$3
 
@@ -100,7 +99,9 @@
         # The Jenkins archive will dereference the soft link, it seems,
         # but I guess I can live with copies of the MP3 for now.
         if [ "$booke" != "$masterbooke" ]; then
-            ln -s -r ${masterwebdir}/${name}.mp3 ${webdir}
+            pushd ${webdir} > /dev/null
+            ln -f -s ../${masterbooke}/${name}.mp3
+            popd > /dev/null
         fi
 
         # Generate the tune web page.