From 68fd58533dd797e92c00b89c9557548afd1ab935 Mon Sep 17 00:00:00 2001
From: Poag <Poag@users.noreply.github.com>
Date: Wed, 7 Jun 2017 13:07:14 +0100
Subject: [PATCH] Update nadeko_installer_1_4.sh

---
 nadeko_installer_1_4.sh | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/nadeko_installer_1_4.sh b/nadeko_installer_1_4.sh
index 4c37817..0d482b7 100644
--- a/nadeko_installer_1_4.sh
+++ b/nadeko_installer_1_4.sh
@@ -23,7 +23,7 @@ else
     exit 1
 fi
 
-root=$(pwd)
+root=/opt
 tempdir=NadekoInstall_Temp
 
 rm -r "$tempdir" 1>/dev/null 2>&1
@@ -38,23 +38,14 @@ echo "NadekoBot downloaded."
 
 echo ""
 echo "Downloading Nadeko dependencies"
-cd $root/$tempdir/NadekoBot/Discord.Net/src/Discord.Net.Core/
-dotnet restore 1>/dev/null 2>&1
-cd $root/$tempdir/NadekoBot/Discord.Net/src/Discord.Net.Rest/
-dotnet restore 1>/dev/null 2>&1
-cd $root/$tempdir/NadekoBot/Discord.Net/src/Discord.Net.WebSocket/
-dotnet restore 1>/dev/null 2>&1
-cd $root/$tempdir/NadekoBot/Discord.Net/src/Discord.Net.Commands/
-dotnet restore 1>/dev/null 2>&1
-cd $root/$tempdir/NadekoBot/src/NadekoBot/
-dotnet restore 1>/dev/null 2>&1
+cd $root/$tempdir/NadekoBot
+dotnet restore
 echo ""
 echo "Download done"
 
 echo ""
 echo "Building NadekoBot"
-cd $root/$tempdir/NadekoBot/src/NadekoBot/
-dotnet build --configuration Release 1>/dev/null 2>&1
+dotnet build --configuration Release
 echo ""
 echo "Building done. Moving Nadeko"
 
@@ -71,6 +62,8 @@ else
     echo ""
     echo "credentials.json copied to the new version"
     cp -RT $root/NadekoBot_old/src/NadekoBot/bin/ $root/NadekoBot/src/NadekoBot/bin/ 1>/dev/null 2>&1
+    cp -RT $root/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data/NadekoBot.db $root/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.1/data/NadekoBot.db 1>/dev/null 2>&1
+    mv -f $root/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data/NadekoBot.db $root/NadekoBot/src/NadekoBot/bin/Release/netcoreapp1.0/data/NadekoBot_old.db 1>/dev/null 2>&1
     echo ""
     echo "Database copied to the new version"
     cp -RT $root/NadekoBot_old/src/NadekoBot/data/ $root/NadekoBot/src/NadekoBot/data/ 1>/dev/null 2>&1