From fa85d4e0b45897bc18e29fcc5acc2560b2ed809f Mon Sep 17 00:00:00 2001
From: unknown <alex.wilkinson.admin@CST008570.kmh.nhs.uk>
Date: Mon, 9 May 2016 08:45:08 +0100
Subject: [PATCH] linking entire data dir to allow for future files.

---
 init/{30_certificates.sh => 10_certificates.sh} | 0
 init/30_oldconfig.sh                            | 5 +++++
 init/40_nadekoinstall.sh                        | 7 ++++++-
 init/50_configuration.sh                        | 6 ++----
 4 files changed, 13 insertions(+), 5 deletions(-)
 rename init/{30_certificates.sh => 10_certificates.sh} (100%)
 create mode 100644 init/30_oldconfig.sh

diff --git a/init/30_certificates.sh b/init/10_certificates.sh
similarity index 100%
rename from init/30_certificates.sh
rename to init/10_certificates.sh
diff --git a/init/30_oldconfig.sh b/init/30_oldconfig.sh
new file mode 100644
index 0000000..3b89c61
--- /dev/null
+++ b/init/30_oldconfig.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+#Test For Old Style config files
+if [-d /config/data]; then echo "Data dir ok"; else mkdir -p /config/data; fi
+if test -f "/config/config.json"; then mv /config/config.json /config/data/config.json; else echo "New Config"; fi
+if test -f "/config/nadekobot.sqlite"; then mv /config/nadekobot.sqlite /config/data/nadekobot.sqlite; else echo "New SQlite"; fi
\ No newline at end of file
diff --git a/init/40_nadekoinstall.sh b/init/40_nadekoinstall.sh
index 834682c..6f2f5a9 100644
--- a/init/40_nadekoinstall.sh
+++ b/init/40_nadekoinstall.sh
@@ -1,9 +1,14 @@
 #!/bin/bash
 ##Install NadekoBot
-
 #Cleanup Old
 rm -rf /root/NadekoBot
 
 #Get NadekoBot Latest
 curl -s https://api.github.com/repos/Kwoth/NadekoBot/releases | grep browser_download_url | head -n 1 | cut -d '"' -f 4|wget -i - -O /root/NadekoBot.latest.zip &&\
 unzip /root/NadekoBot.latest.zip -d /root/NadekoBot
+
+#Sync any new data files
+rsync --ignore-existing -r /root/NadekoBot/data /config
+
+#Remove data folder
+rm -rf /root/NadekoBot/data
\ No newline at end of file
diff --git a/init/50_configuration.sh b/init/50_configuration.sh
index e3c321e..213a710 100644
--- a/init/50_configuration.sh
+++ b/init/50_configuration.sh
@@ -8,10 +8,8 @@ if test -f "/config/config.json"; then echo "Config Exist"; else cp /root/Nadeko
 
 #Remove Built in
 rm /root/NadekoBot/credentials.json
-rm /root/NadekoBot/data/nadekobot.sqlite
-rm /root/NadekoBot/data/config.json
+
 
 #Adding Config file sym links
 ln -s /config/credentials.json /root/NadekoBot/credentials.json
-ln -s /config/nadekobot.sqlite /root/NadekoBot/data/nadekobot.sqlite
-ln -s /config/config.json /root/NadekoBot/data/config.json
\ No newline at end of file
+sudp ln -ds /config/data /root/nadekobot/data 
\ No newline at end of file