From 6b25d4ecfa9bd6acbc1c5fd01a1b1bb275a74497 Mon Sep 17 00:00:00 2001 From: Andrew Miner Date: Sun, 4 Jun 2017 20:38:27 -0700 Subject: [PATCH] Make build.sh drop output in correct dirs --- build.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/build.sh b/build.sh index adab696..f73c5a1 100755 --- a/build.sh +++ b/build.sh @@ -23,7 +23,7 @@ function check-dependencies { echo exit 1 fi - + if [[ ! -d "$LILYPOND_APP" ]]; then echo "Could not find LilyPond! Please install it from http://lilypond.org/download.html." echo @@ -34,10 +34,10 @@ function check-dependencies { function compile-ly { BASE_NAME=$(basename -s .ly $1) DIR_NAME=$(dirname $1 | sed "s@./src/scores/@@") - + mkdir -p "dist/$DIR_NAME" $LILYPOND -I "$PWD/src/includes" -I "$PWD/src/pieces" -o "dist/$DIR_NAME/$BASE_NAME" $1 - + if [[ "$VIEW" == "YES" ]]; then open -a "/Applications/Google Chrome.app" -g "dist/$DIR_NAME/$BASE_NAME.pdf" fi @@ -56,12 +56,12 @@ function command-clean { function command-compile { [[ ${#PATTERNS[*]} == 0 ]] && PATTERNS=(".*") - + while true; do PATTERN=${PATTERNS[0]} [[ "$PATTERN" == "" ]] && break PATTERNS=(${PATTERNS[@]:1}) - + find src/scores -name "*.ly" | grep -v includes | grep "$PATTERN" | while read FILE; do compile-ly "./$FILE" done @@ -69,8 +69,9 @@ function command-compile { } function command-watch { + CURRENT_DIR=$(dirname $0) $FSWATCH -r src/scores -i '*.ly$' -e "includes" | while read FILE; do - FILE=$(echo $FILE | sed "s@$PWD@.@") + FILE=$(echo $FILE | sed 's@.*/src/scores/\(.*\)$@./src/scores/\1@') compile-ly $FILE done }