fix bin/doc

fchastanet · Nov 12, 2023 · 7425c9c · 7425c9c
1 parent 22d2b92
commit 7425c9c
Show file tree

Hide file tree

Showing 22 changed files with 105 additions and 784 deletions.
diff --git a/.cspell/bash.txt b/.cspell/bash.txt
@@ -116,3 +116,5 @@ hlocalhost
 uuser
 ppassword
 DELIMS
+Facadesh
+Scriptsh
diff --git a/bin/cli b/bin/cli
@@ -58,7 +58,11 @@ interruptManagement() {
 trap interruptManagement INT
 SCRIPT_NAME=${0##*/}
 REAL_SCRIPT_FILE="$(readlink -e "$(realpath "${BASH_SOURCE[0]}")")"
-CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+if [[ -n "${EMBED_CURRENT_DIR}" ]]; then
+  CURRENT_DIR="${EMBED_CURRENT_DIR}"
+else
+  CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+fi
 
 ################################################
 # Temp dir management

diff --git a/bin/dbImport b/bin/dbImport
@@ -58,7 +58,11 @@ interruptManagement() {
 trap interruptManagement INT
 SCRIPT_NAME=${0##*/}
 REAL_SCRIPT_FILE="$(readlink -e "$(realpath "${BASH_SOURCE[0]}")")"
-CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+if [[ -n "${EMBED_CURRENT_DIR}" ]]; then
+  CURRENT_DIR="${EMBED_CURRENT_DIR}"
+else
+  CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+fi
 
 ################################################
 # Temp dir management

diff --git a/bin/dbImportProfile b/bin/dbImportProfile
@@ -58,7 +58,11 @@ interruptManagement() {
 trap interruptManagement INT
 SCRIPT_NAME=${0##*/}
 REAL_SCRIPT_FILE="$(readlink -e "$(realpath "${BASH_SOURCE[0]}")")"
-CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+if [[ -n "${EMBED_CURRENT_DIR}" ]]; then
+  CURRENT_DIR="${EMBED_CURRENT_DIR}"
+else
+  CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+fi
 
 ################################################
 # Temp dir management

diff --git a/bin/dbImportStream b/bin/dbImportStream
@@ -58,7 +58,11 @@ interruptManagement() {
 trap interruptManagement INT
 SCRIPT_NAME=${0##*/}
 REAL_SCRIPT_FILE="$(readlink -e "$(realpath "${BASH_SOURCE[0]}")")"
-CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+if [[ -n "${EMBED_CURRENT_DIR}" ]]; then
+  CURRENT_DIR="${EMBED_CURRENT_DIR}"
+else
+  CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+fi
 
 ################################################
 # Temp dir management

diff --git a/bin/dbQueryAllDatabases b/bin/dbQueryAllDatabases
diff --git a/bin/dbScriptAllDatabases b/bin/dbScriptAllDatabases
diff --git a/bin/doc b/bin/doc
@@ -58,7 +58,11 @@ interruptManagement() {
 trap interruptManagement INT
 SCRIPT_NAME=${0##*/}
 REAL_SCRIPT_FILE="$(readlink -e "$(realpath "${BASH_SOURCE[0]}")")"
-CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+if [[ -n "${EMBED_CURRENT_DIR}" ]]; then
+  CURRENT_DIR="${EMBED_CURRENT_DIR}"
+else
+  CURRENT_DIR="$(cd "$(readlink -e "${REAL_SCRIPT_FILE%/*}")" && pwd -P)"
+fi
 
 ################################################
 # Temp dir management
@@ -1636,10 +1640,13 @@ updateArgListTraceVerboseCallback() {
   BASH_FRAMEWORK_ARGV_FILTERED+=(-vvv)
 }
 
+docCommand parse "${BASH_FRAMEWORK_ARGV[@]}"
+
 run() {
   if [[ "${IN_BASH_DOCKER:-}" != "You're in docker" ]]; then
     DOCKER_RUN_OPTIONS=$"-e ORIGINAL_DOC_DIR=${DOC_DIR}" \
-      "${COMMAND_BIN_DIR}/runBuildContainer" "/bash/bin/doc" "${RUN_CONTAINER_ARGV_FILTERED[@]}"
+      "${COMMAND_BIN_DIR}/runBuildContainer" "/bash/bin/doc" \
+      "${RUN_CONTAINER_ARGV_FILTERED[@]}"
     return $?
   fi
 
@@ -1669,7 +1676,7 @@ run() {
   ShellDoc::generateMdFileFromTemplate \
     "${BASH_TOOLS_ROOT_DIR}/Commands.tmpl.md" \
     "${DOC_DIR}/Commands.md" \
-    "${FRAMEWORK_BIN_DIR}" \
+    "${BASH_TOOLS_ROOT_DIR}/bin" \
     TOKEN_NOT_FOUND_COUNT \
     '(bash-tpl|plantuml|definitionLint|compile|installFacadeExample)$'