From 37474b20f10d3e88783c8ab68e87eb45a58e8032 Mon Sep 17 00:00:00 2001 From: Jim Hague Date: Sat, 31 Aug 2013 00:38:45 +0100 Subject: [PATCH] Pigwidgeon doesn't have -r in ln. So do it another way. --- Library/AstleysRide.abc | 7 +++++++ makeWeb.sh | 5 +++-- 2 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 Library/AstleysRide.abc diff --git a/Library/AstleysRide.abc b/Library/AstleysRide.abc new file mode 100644 index 0000000..3c13e64 --- /dev/null +++ b/Library/AstleysRide.abc @@ -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 --git a/makeWeb.sh b/makeWeb.sh index 446516c..07d70a7 100755 --- a/makeWeb.sh +++ b/makeWeb.sh @@ -27,7 +27,6 @@ output=index.html tunelist=tunelist.html booke=$1 masterbooke=$2 -masterwebdir=$dir/web/$2 title=$booke instrument=$3 @@ -100,7 +99,9 @@ find $bookedir -name "*.abc" | sort | # 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.