From be9f0249e95570065cb3c32487faaf8a7d113b93 Mon Sep 17 00:00:00 2001 From: Lorenz Stechauner Date: Thu, 31 May 2018 21:03:33 +0200 Subject: [PATCH] Update --- run.sh | 2 +- src/necronda-server.cpp | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/run.sh b/run.sh index e36d85c..a599718 100644 --- a/run.sh +++ b/run.sh @@ -1,6 +1,6 @@ #!/bin/bash echo "-- Building and starting Necronda Server..." -make && \ +make compile && \ echo -e "-- Successfully finished compiling!\n" && \ sleep 0.0625 && \ echo -e "-- Starting Server...\n" && \ diff --git a/src/necronda-server.cpp b/src/necronda-server.cpp index 6429c68..9a5dd41 100644 --- a/src/necronda-server.cpp +++ b/src/necronda-server.cpp @@ -139,14 +139,6 @@ std::string formatSize(unsigned long bytes) { return std::string(buffer); } -string getWebRoot(string host) { - string root = webroot + host; - if (fileExists(root)) { - return root; - } else { - return webroot + "www.necronda.net"; - } -} @@ -227,6 +219,16 @@ string read_line(FILE* file) { #include "network/http/HttpResponse.cpp" #include "network/http/HttpConnection.cpp" +string getWebRoot(string host) { + string root = webroot + host; + if (fileExists(root)) { + return root; + } else { + return webroot + "www.necronda.net"; + } +} + + #include "client.cpp"