diff --git a/Jenkinsfile b/Jenkinsfile index cf5e15a..bc7cfb8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,13 +3,14 @@ def deployTo(String targetDir) { sh "echo \"Deploying to ${targetDir}\"" sh "mkdir -p ${targetDir}" + // sh "mkdir -p ${targetDir}/Handbooks" sh "qpdf --encrypt billy billy 40 -- --allow-weak-crypto \"${MSTR_BOOK}\" \"enc_${MSTR_BOOK}\"" - sh "rsync -a --delete \"enc_${MSTR_BOOK}\" \"${targetDir}/\"" - sh "rsync -a --delete \"${FULL_BOOK}\" \"${targetDir}/\"" - sh "rsync -a --delete \"${PLYR_BOOK}\" \"${targetDir}/\"" - sh "rsync -a --delete \"${HNDB_DIR}*\" \"${targetDira}/\"" + // sh "rsync -a --delete \"enc_${MSTR_BOOK}\" \"${targetDir}/\"" + // sh "rsync -a --delete \"${FULL_BOOK}\" \"${targetDir}/\"" + // sh "rsync -a --delete \"${PLYR_BOOK}\" \"${targetDir}/\"" + sh "rsync -a --delete --mkpath \"${HNDB_DIR}*\" \"${targetDir}/\"" } pipeline { agent { label 'latex_no_docker' } @@ -38,7 +39,7 @@ pipeline { stage('Install ravenous-tools') { steps { - sh 'cargo +nightly --debug install --git https://proxy.dandaedre.com/gitea/Ravenous/ravenous-tools.git || echo "ravenous-tolls already installed"' // Install the latest mdBooks + sh 'cargo +nightly install --debug --git https://proxy.dandaedre.com/gitea/Ravenous/ravenous-tools.git || echo "ravenous-tolls already installed"' // Install the latest mdBooks } } @@ -155,6 +156,6 @@ def runBuild(String deployDir) { // sh "ravenous-tools make -t glossaries ${texFile}" // sh "ravenous-tools make -N ${texFile}" // second build for correct references // } - sh './build.sh --raw full' sh "./all_players.sh --raw" + // sh './build.sh --raw full' } diff --git a/all_players.sh b/all_players.sh index f2ed599..b58f269 100755 --- a/all_players.sh +++ b/all_players.sh @@ -52,7 +52,7 @@ for entry in "${entries[@]}"; do # - `$options` expands into its constituent arguments (unquoted) # - `"${wrapper_opts[@]}"` appends whatever the user typed after # this wrapper script, *verbatim*. - ./build.sh player $options "${wrapper_opts[@]}" + ./build.sh "${wrapper_opts[@]}" player $options # The build step is expected to produce a file named: # Player_handbook_build.pdf diff --git a/build.sh b/build.sh index 17b656b..62942e3 100755 --- a/build.sh +++ b/build.sh @@ -150,6 +150,7 @@ case "$MODE" in mkdir -p ~/.local/share/fonts/ mkdir -p ./Images/Radar/ mkdir -p ./Bestiaire/ + mkdir -p ./Handbooks/ cp ./Ressources/lmroman8-regular.ttf ~/.local/share/fonts/ @@ -216,7 +217,7 @@ case "$MODE" in run_podman make -t clean Ravenous_build.tex || exit $? run_podman graphs remove || exit $? rm -f ./Ravenous_build.* ./Player_handbook_build.* Bestiaire/* - rm -f ./Handbooks/* + rm -rf ./Handbooks/ echo "--- Cleanup Completed Successfully ---" ;;