Mercurial > dottes
changeset 946:0f4ba68d6059 build-default-345
Fix target generation for transposed booke web items.
| author | Jim Hague <jim.hague@acm.org> |
|---|---|
| date | Tue, 06 Aug 2019 08:48:39 +0100 |
| parents | 5b6834425a34 |
| children | f3a722866215 |
| files | makeWeb.sh makeWebGraphics.sh |
| diffstat | 2 files changed, 10 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/makeWeb.sh Tue Aug 06 08:47:45 2019 +0100 +++ b/makeWeb.sh Tue Aug 06 08:48:39 2019 +0100 @@ -29,6 +29,11 @@ instrument=$3 abc2xml=$dir/abc2xml/abc2xml.py +instrumentSuffix="${1##*-}" +if [ "$1" != "$instrumentSuffix" ]; then + basetunedir="${basetunedir}-${instrumentSuffix}" +fi + buildno=`cat buildno.txt` # Remove trailing % added for Latex purposes. buildno=${buildno%%%} @@ -41,7 +46,6 @@ if [ -n "$instrument" ]; then title="${title} ($instrument)" subtitle="${subtitle} ($instrument)" - basetunedir="${basetunedir}-${instrument}" fi mkdir -p $bookewebdir
--- a/makeWebGraphics.sh Tue Aug 06 08:47:45 2019 +0100 +++ b/makeWebGraphics.sh Tue Aug 06 08:48:39 2019 +0100 @@ -4,8 +4,8 @@ # They go into web/tunes/<tunename>, or web/tunes-<instrument>/<tunename>. # -if [[ $# -lt 1 ]]; then - echo "Usage: makeWebGraphics.sh <book dir name> [<instrument name>]" +if [[ $# -ne 1 ]]; then + echo "Usage: makeWebGraphics.sh <book dir name>" exit 1 fi @@ -15,10 +15,10 @@ basewebdir=$dir/web basetunedir=$basewebdir/tunes graphicsdir=$dir/graphics/$1 -instrument=$2 -if [ -n "$instrument" ]; then - basetunedir="${basetunedir}-${instrument}" +instrumentSuffix="${1##*-}" +if [ "$1" != "$instrumentSuffix" ]; then + basetunedir="${basetunedir}-${instrumentSuffix}" fi # Now, for each tune, make the main tune and tune first line bitmaps.