bugfixses swagger

2 years ago · da8ea5b35c
parent 863ed6a85e
commit da8ea5b35c
3 changed files with 6 additions and 5 deletions
--- a/entrypoint.sh
+++ b/entrypoint.sh
@ -48,11 +48,11 @@ if [ ! "$GENERATOR_SCRIPT" ] || [ ! "$DOC_DIR" ] || echo "$DEST" | grep -E -q "^
  help
 fi

-. "$GENERATOR_SCRIPT"
+RELATIVE_PATH=$(echo "$DRONE_REPO_OWNER/$DRONE_REPO_NAME/$DEST/" | tr -s "/")

+. "$GENERATOR_SCRIPT"
 generate "$DOC_DIR" # generates doc using the wanted generator

-RELATIVE_PATH=$(echo "$DRONE_REPO_OWNER/$DRONE_REPO_NAME/$DEST/" | tr -s "/")
 SERVER_TARGET="/usr/share/nginx/html/$RELATIVE_PATH"

 # launches rsync in archive, verbose and compression mode
--- a/generators/docusaurus.sh
+++ b/generators/docusaurus.sh
@ -1,8 +1,8 @@
 GEN_PATH="/docs/docusaurus"

 generate() {
-  mkdir -p $GEN_PATH
  (cd "$1" && npm install && npm run build)

+  mkdir -p $GEN_PATH
  mv build/* $GEN_PATH
 }
--- a/generators/swagger.sh
+++ b/generators/swagger.sh
@ -9,12 +9,13 @@ generate() {
  echo "<!DOCTYPE html>
  <html>
    <head>
-      <meta http-equiv=\"Refresh\" content=\"0; url=/swagger?url=/documentation/$DRONE_REPO_OWNER/swagger/$DRONE_REPO_NAME/$SWAGGER_FILE\" />
+      <meta http-equiv=\"Refresh\" content=\"0; url=/swagger?url=/documentation/${RELATIVE_PATH}$SWAGGER_FILE\" />
    </head>
    <body>
-      <p>Suivez <a href=\"/swagger?url=/swagger?url=/documentation/$DRONE_REPO_OWNER/swagger/$DRONE_REPO_NAME/$SWAGGER_FILE\">ce lien</a>.</p>
+      <p>Suivez <a href=\"/swagger?url=/swagger?url=/documentation/${RELATIVE_PATH}$SWAGGER_FILE\">ce lien</a>.</p>
    </body>
  </html>" > $GEN_PATH/CLICKME.html

+  mkdir -p $GEN_PATH
  mv "$SWAGGER_FILE" $GEN_PATH
 }