From 1cfe526bb94e122013fa2b1bff91d21f199b6456 Mon Sep 17 00:00:00 2001
From: Atinoda <61033436+Atinoda@users.noreply.github.com>
Date: Wed, 24 May 2023 13:43:48 +0100
Subject: [PATCH] Improve config directory handling

---
 .gitignore                        | 6 ------
 config/{ => loras}/.gitkeep       | 0
 config/models/.gitkeep.txt        | 0
 config/presets/.gitkeep           | 0
 config/prompts/.gitkeep           | 0
 config/softprompts/.gitkeep       | 0
 config/training/datasets/.gitkeep | 0
 config/training/formats/.gitkeep  | 0
 scripts/docker-entrypoint.sh      | 7 ++++---
 9 files changed, 4 insertions(+), 9 deletions(-)
 rename config/{ => loras}/.gitkeep (100%)
 create mode 100644 config/models/.gitkeep.txt
 create mode 100644 config/presets/.gitkeep
 create mode 100644 config/prompts/.gitkeep
 create mode 100644 config/softprompts/.gitkeep
 create mode 100644 config/training/datasets/.gitkeep
 create mode 100644 config/training/formats/.gitkeep

diff --git a/.gitignore b/.gitignore
index a0ea2dc..ae29845 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
 _non
-config/loras/*
-config/models/*
-config/presets/*
-config/prompts/*
-config/softprompts/*
-config/training/*
 text-generation-webui/
diff --git a/config/.gitkeep b/config/loras/.gitkeep
similarity index 100%
rename from config/.gitkeep
rename to config/loras/.gitkeep
diff --git a/config/models/.gitkeep.txt b/config/models/.gitkeep.txt
new file mode 100644
index 0000000..e69de29
diff --git a/config/presets/.gitkeep b/config/presets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/config/prompts/.gitkeep b/config/prompts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/config/softprompts/.gitkeep b/config/softprompts/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/config/training/datasets/.gitkeep b/config/training/datasets/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/config/training/formats/.gitkeep b/config/training/formats/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/scripts/docker-entrypoint.sh b/scripts/docker-entrypoint.sh
index 32a9350..4d29d4c 100644
--- a/scripts/docker-entrypoint.sh
+++ b/scripts/docker-entrypoint.sh
@@ -10,10 +10,11 @@ function ctrl_c {
 trap ctrl_c SIGTERM SIGINT SIGQUIT SIGHUP
 
 # Generate default configs if empty
-CONFIG_DIRECTORIES=("loras" "models" "presets" "prompts" "softprompts" "training")
+CONFIG_DIRECTORIES=("loras" "models" "presets" "prompts" "softprompts" "training/datasets" "training/formats")
 for config_dir in "${CONFIG_DIRECTORIES[@]}"; do
-  if [ -z "$(ls -A /app/"$config_dir")" ]; then
-    cp -ar /src/"$config_dir" /app/
+  if [ -z "$(ls /app/"$config_dir")" ]; then
+    echo "*** Initialising config for: '$config_dir' ***"
+    cp -ar /src/"$config_dir"/* /app/"$config_dir"/
     chown -R 1000:1000 /app/"$config_dir"  # Not ideal... but convenient.
   fi
 done