diff --git a/devTools/makeTwineJSPassage.sh b/devTools/makeTwineJSPassage.sh index 408018e4a158471e200fa5211e1c417c955edf71..af0db0d42124242c89d66c0c4e13b2b7115f8fc0 100755 --- a/devTools/makeTwineJSPassage.sh +++ b/devTools/makeTwineJSPassage.sh @@ -6,8 +6,13 @@ # $1: root repo dir # $2: output file name collectJSForTwine() { + local files=$(find . -path ./art/assistantArt.js -prune -o -name '*.js' -print) + files=$(echo "$files" | sort) echo "" > "$2" - find . -path ./art/assistantArt.js -prune -o -name '*.js' -exec echo -e "\n/* {} */\n" \; -a -exec sed -nf "$1"/devTools/stripComments.sed {} \; >> "$2" + for f in $files; do + echo -e "\n/* ${f} */\n" >> "$2" + sed -nf "$1"/devTools/stripComments.sed "$f" >> "$2" + done } ROOT_REPO_DIR="$(git rev-parse --show-toplevel)" diff --git a/src/pregmod/Jquery/CSS.tw b/src/001-lib/Jquery/CSS.tw similarity index 100% rename from src/pregmod/Jquery/CSS.tw rename to src/001-lib/Jquery/CSS.tw diff --git a/src/pregmod/Jquery/Jquery.js b/src/001-lib/Jquery/Jquery.js similarity index 100% rename from src/pregmod/Jquery/Jquery.js rename to src/001-lib/Jquery/Jquery.js diff --git a/src/config/start.tw b/src/002-config/start.tw similarity index 100% rename from src/config/start.tw rename to src/002-config/start.tw diff --git a/src/config/sugarCubeConfig.js b/src/002-config/sugarCubeConfig.js similarity index 100% rename from src/config/sugarCubeConfig.js rename to src/002-config/sugarCubeConfig.js