Mercurial > dottes

changeset 386:e09ff88ab469

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Pigwidgeon doesn't have -r in ln. So do it another way.
author Jim Hague <jim.hague@acm.org>
date Sat, 31 Aug 2013 00:38:45 +0100
parents ce5dccdd45bd
children 502fa2df300e
files Library/AstleysRide.abc makeWeb.sh
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/Library/AstleysRide.abc	Sat Aug 31 00:38:45 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:|
--- a/makeWeb.sh	Fri Aug 30 23:59:41 2013 +0100
+++ b/makeWeb.sh	Sat Aug 31 00:38:45 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.