Improve util script path handling

VedaWebProject · Jul 3, 2024 · 6720146 · 6720146
1 parent 71f5754
commit 6720146
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/Tekst-Util/README.md b/Tekst-Util/README.md
@@ -4,6 +4,8 @@ This Bash script simplifies performing common maintenance tasks (backup/restore
 
 ## Usage
 
+> ‼ **IMPORTANT:** The script assumes it's located inside `/<path-to-Tekst-repo>/Tekst-Util/`, so **do not move it anywhere else!**!
+
 Run `./tekst-util --help` for an overview of the commands, flags and arguments. Each command has its own help that can be accessed via `./tekst-util <command> --help`.
 
 ## Development

diff --git a/Tekst-Util/src/index_command.sh b/Tekst-Util/src/index_command.sh
@@ -7,6 +7,7 @@ dev=${args[--dev]}
 if [[ $container ]]; then
     docker exec -e TEKST_DEV_MODE=$dev -i $container $run_python -m tekst index
 else
-    cd Tekst-API
+    cd_to_script_parent_dir
+    cd ../Tekst-API
     TEKST_DEV_MODE=$dev $run_python -m tekst index
 fi
diff --git a/Tekst-Util/src/lib/fnc.sh b/Tekst-Util/src/lib/fnc.sh
@@ -0,0 +1,4 @@
+cd_to_script_parent_dir() {
+    script_parent_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+    cd "$script_parent_dir"
+}
diff --git a/Tekst-Util/tekst-util b/Tekst-Util/tekst-util
@@ -288,6 +288,13 @@ inspect_args() {
   fi
 }
 
+# :command.user_lib
+# src/lib/fnc.sh
+cd_to_script_parent_dir() {
+    script_parent_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+    cd "$script_parent_dir"
+}
+
 # :command.command_functions
 # :command.function
 tekst_util_backup_command() {
@@ -346,7 +353,8 @@ tekst_util_index_command() {
   if [[ $container ]]; then
       docker exec -e TEKST_DEV_MODE=$dev -i $container $run_python -m tekst index
   else
-      cd Tekst-API
+      cd_to_script_parent_dir
+      cd ../Tekst-API
       TEKST_DEV_MODE=$dev $run_python -m tekst index
   fi