Automated merge with ssh://hg.cryhavoc.org.uk/dottes

This commit is contained in:
Jim Hague 2013-08-31 00:38:48 +01:00
commit d8ad55d189
2 changed files with 10 additions and 2 deletions

7
Library/AstleysRide.abc Normal file
View File

@ -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:|

View File

@ -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.