diff --git a/README.md b/README.md index 2f874e3..5e45fe8 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,8 @@ The daemon should work on all Ubuntu starting from 18.04 onward, it's possible t * edit the daemon configuration file _daemon/daemon.conf_ and change the _interface_name_ parameter to the ethernet network interface you want to use. Ex: _eth0_ * install the driver by executing from the main folder: - cd 3rdparty/ravenna-alsa-lkm/driver - sudo insmod ./MergingRavennaALSA.ko + (cd 3rdparty/ravenna-alsa-lkm/driver && sudo insmod ./MergingRavennaALSA.ko) + * start the daemon by executing from the main folder: cd daemon diff --git a/build.sh b/build.sh index 9bc2067..ed77e53 100755 --- a/build.sh +++ b/build.sh @@ -26,11 +26,8 @@ fi cd .. cd webui -if [ -f webui.tar.gz ]; then - rm -f webui.tar.gz -fi echo "Downloading current webui release ..." -wget https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz +wget --timestamping https://github.com/bondagit/aes67-linux-daemon/releases/latest/download/webui.tar.gz if [ -f webui.tar.gz ]; then tar -xzvf webui.tar.gz else @@ -43,7 +40,14 @@ cd .. cd daemon echo "Building aes67-daemon ..." -cmake -DCPP_HTTPLIB_DIR="$TOPDIR"/3rdparty/cpp-httplib -DRAVENNA_ALSA_LKM_DIR="$TOPDIR"/3rdparty/ravenna-alsa-lkm -DENABLE_TESTS=ON -DWITH_AVAHI=ON -DFAKE_DRIVER=OFF -DWITH_SYSTEMD=ON . +cmake \ + -DCPP_HTTPLIB_DIR="${TOPDIR}/3rdparty/cpp-httplib" \ + -DRAVENNA_ALSA_LKM_DIR="${TOPDIR}/3rdparty/ravenna-alsa-lkm" \ + -DENABLE_TESTS=ON \ + -DWITH_AVAHI=ON \ + -DFAKE_DRIVER=OFF \ + -DWITH_SYSTEMD=ON \ + . make -j cd .. diff --git a/buildfake.sh b/buildfake.sh index 801e560..2c9b325 100755 --- a/buildfake.sh +++ b/buildfake.sh @@ -26,7 +26,13 @@ cd .. cd daemon echo "Building aes67-daemon ..." -cmake -DCPP_HTTPLIB_DIR="$TOPDIR"/3rdparty/cpp-httplib -DRAVENNA_ALSA_LKM_DIR="$TOPDIR"/3rdparty/ravenna-alsa-lkm -DENABLE_TESTS=ON -DWITH_AVAHI=OFF -DFAKE_DRIVER=ON . +cmake \ + -DCPP_HTTPLIB_DIR="${TOPDIR}/3rdparty/cpp-httplib" \ + -DRAVENNA_ALSA_LKM_DIR="${TOPDIR}/3rdparty/ravenna-alsa-lkm" \ + -DENABLE_TESTS=ON \ + -DWITH_AVAHI=OFF \ + -DFAKE_DRIVER=ON \ + . make cd .. diff --git a/daemon/http_server.cpp b/daemon/http_server.cpp index ee56d5e..e3f67bd 100644 --- a/daemon/http_server.cpp +++ b/daemon/http_server.cpp @@ -83,7 +83,7 @@ bool HttpServer::init() { return false; } - svr_.set_mount_point(nullptr, config_->get_http_base_dir().c_str()); + svr_.set_mount_point("/", config_->get_http_base_dir().c_str()); svr_.Get("(/|/Config|/PTP|/Sources|/Sinks|/Browser)", [&](const Request& req, Response& res) {