diff --git a/Morris/image.jpg b/Morris/image.jpg index 92bfbcd..e00bf1a 100644 Binary files a/Morris/image.jpg and b/Morris/image.jpg differ diff --git a/makeAll.sh b/makeAll.sh index d1180ce..5e7e096 100755 --- a/makeAll.sh +++ b/makeAll.sh @@ -69,20 +69,55 @@ makeASingleBooke() makeABumperBooke() { # This can only be used once all the other Bookes have been built. - ./makeBookeTunePages.sh "$1" + for booke in "$@" + do + ./makeBookeTunePages.sh "${booke}" + done ./makeBooke.sh A4 "$@" - ./makeBookeTunePages.sh --use-compact "$1" + for booke in "$@" + do + ./makeBookeTunePages.sh --use-compact "${booke}" + done ./makeBooke.sh A5 "$@" ./makeBooklet.sh "Bumper" } makeBumperBookes() { - makeABumperBooke $1 + makeABumperBooke "$@" + for f in Bumper*.pdf + do + mv $f ./web + done - #makeABumperBooke $1-Cello - #makeABumperBooke $1-HornInF - #makeABumperBooke $1-AltoRecorderCFingering + local cellobumper + local hornbumber + local recorderbumper + + for booke in "$@" + do + cellobumper+=("${booke}-Cello") + hornbumper+=("${booke}-HornInF") + recorderbumper+=("${booke}-AltoRecorderCFingering") + done + makeABumperBooke "${cellobumper[@]}" + for f in Bumper*.pdf + do + t=$(echo $f | sed -e "s/.pdf/-Cello.pdf/") + mv $f ./web/$t + done + makeABumperBooke "${hornbumper[@]}" + for f in Bumper*.pdf + do + t=$(echo $f | sed -e "s/.pdf/-HornInF.pdf/") + mv $f ./web/$t + done + makeABumperBooke "${recorderbumper[@]}" + for f in Bumper*.pdf + do + t=$(echo $f | sed -e "s/.pdf/-AltoRecorderCFingering.pdf/") + mv $f ./web/$t + done } declare buildBookes @@ -104,5 +139,4 @@ do done if [[ ${#bumperBookes[@]} -gt 1 ]]; then makeBumperBookes "${bumperBookes[@]}" - cp Bumper*.pdf ./web fi