From 1015dd0aec8a5e46b9bdbca78ed0ec7eb7ec057e Mon Sep 17 00:00:00 2001 From: Override-6 Date: Sat, 7 Jan 2023 19:53:49 +0100 Subject: [PATCH] bugfixes & debug --- entrypoint.sh | 3 ++- generators/docusaurus.sh | 2 +- generators/doxygen.sh | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/entrypoint.sh b/entrypoint.sh index 0c86d21..b24dd32 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -38,6 +38,7 @@ fi generate "$DOCDIR" # génère la doc avec le bon générateur SERVER_TARGET="/usr/share/nginx/html/$DRONE_REPO_OWNER/$GENERATOR_NAME/$DRONE_REPO_NAME/" +echo "target: $SERVER_TARGET" # lance rsync en mode archive, verbeux et compression # créee le dossier cible ($SERVER_TARGET) @@ -45,4 +46,4 @@ SERVER_TARGET="/usr/share/nginx/html/$DRONE_REPO_OWNER/$GENERATOR_NAME/$DRONE_RE rsync -avz \ --rsync-path="mkdir -p $SERVER_TARGET" \ -e "ssh -o StrictHostKeyChecking=no" \ - --delete "$GEN_PATH" root@nginx:$SERVER_TARGET + --delete "$GEN_PATH" root@nginx:"$SERVER_TARGET" diff --git a/generators/docusaurus.sh b/generators/docusaurus.sh index 1cfc736..787dbad 100644 --- a/generators/docusaurus.sh +++ b/generators/docusaurus.sh @@ -1,7 +1,7 @@ GEN_PATH="/docs/docusaurus" generate() { - mkdir -p /docs/docusaurus/ + mkdir -p $GEN_PATH (cd "$1" && npm install && npm run build) mv build/* $GEN_PATH diff --git a/generators/doxygen.sh b/generators/doxygen.sh index 270dd2c..ca3ac76 100644 --- a/generators/doxygen.sh +++ b/generators/doxygen.sh @@ -1,12 +1,14 @@ GEN_PATH="/docs/doxygen" generate() { - mkdir -p /docs/doxygen/ + if [ ! -f "$1"/Doxyfile ]; then echo "erreure generateur doxygen : Le fichier $1/Doxyfile est manquant" >&2 exit 1 fi doxygen "$1"/Doxyfile + + mkdir -p $GEN_PATH mv html/* $GEN_PATH }