.

source/CMakeLists.txt

@@ -81,8 +81,26 @@ if(WIN32)
   )
 endif()
 
+# Configure libassert
+include(FetchContent)
+FetchContent_Declare(
+  libassert
+  GIT_REPOSITORY https://github.com/jeremy-rifkin/libassert.git
+  GIT_TAG        v2.1.5
+)
+FetchContent_MakeAvailable(libassert)
+include(FetchContent)
+FetchContent_Declare(
+  cpptrace
+  GIT_REPOSITORY https://github.com/jeremy-rifkin/cpptrace.git
+  GIT_TAG        v0.8.3
+)
+FetchContent_MakeAvailable(cpptrace)
+
 # Link libraries
 target_link_libraries(dropshell PRIVATE
+    libassert::assert
+    cpptrace::cpptrace
 )
 
 # Install targets

source/src/autocomplete.cpp

@@ -5,7 +5,7 @@
 #include "services.hpp"
 #include "servers.hpp"
 
-#include <assert.hpp>
+#include <libassert/assert.hpp>
 #include <algorithm>
 #include <iostream>
 

source/src/commands/backupdata.cpp

@@ -5,7 +5,7 @@
 #include <filesystem>
 
 #include "utils/output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "command_registry.hpp"
 #include "config.hpp"

source/src/commands/colours.cpp

@@ -1,7 +1,7 @@
 #include "command_registry.hpp"
 #include "config.hpp"
 #include "utils/output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 

source/src/commands/create-server.cpp

@@ -10,7 +10,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 

source/src/commands/create-service.cpp

@@ -3,7 +3,7 @@
 #include "shared_commands.hpp"
 #include "templates.hpp"
 
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "services.hpp"
 

source/src/commands/create-template.cpp

@@ -4,7 +4,7 @@
 #include "utils/directories.hpp"
 #include "shared_commands.hpp"
 #include "version.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "templates.hpp"
 
 #include <unistd.h>

source/src/commands/destroy.cpp

@@ -8,7 +8,7 @@
 #include "templates.hpp"
 #include "utils/utils.hpp"
 
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell
 {

source/src/commands/edit.cpp

@@ -9,7 +9,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 

source/src/commands/help.cpp

@@ -10,7 +10,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 

source/src/commands/install.cpp

@@ -16,7 +16,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "servers.hpp"
 
 namespace dropshell

source/src/commands/list.cpp

@@ -14,7 +14,7 @@
 #include <iostream>
 #include <sstream>
 #include <filesystem>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell {
 

source/src/commands/restoredata.cpp

@@ -5,7 +5,7 @@
 #include <filesystem>
 
 #include "utils/output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "command_registry.hpp"
 #include "config.hpp"

source/src/commands/shared_commands.cpp

@@ -1,5 +1,5 @@
 #include "shared_commands.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "servers.hpp"
 #include "directories.hpp"

source/src/commands/ssh.cpp

@@ -7,7 +7,7 @@
 #include "services.hpp"
 #include "servers.hpp"
 #include "templates.hpp"
-#include "assert.hpp"
+#include <libassert/assert.hpp>
 
 namespace dropshell
 {

source/src/commands/uninstall.cpp

@@ -3,7 +3,7 @@
 #include "shared_commands.hpp"
 #include "templates.hpp"
 
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "utils/utils.hpp"
 #include "services.hpp"
 

source/src/main.cpp

@@ -16,7 +16,7 @@
 #include <vector>
 #include <iomanip>
 #include <chrono>
-#include <assert.hpp>
+#include <libassert/assert.hpp>
 #include <sstream>
 #include <algorithm>
 namespace dropshell {

source/src/servers.cpp

@@ -6,7 +6,7 @@
 #include "utils/utils.hpp"
 #include "utils/execute.hpp"
 #include "output.hpp"
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 #include "config.hpp"
 
 #include <iostream>

source/src/service_runner.cpp

@@ -7,7 +7,7 @@
 // #include <iomanip>
 // #include <filesystem>
 // #include <unistd.h>
-// #include "utils/assert.hpp"
+// #include <libassert/assert.hpp>
 
 // #include "config.hpp"
 // #include "servers.hpp"

source/src/services.cpp

@@ -4,7 +4,7 @@
 #include "templates.hpp"
 #include "config.hpp"
 #include "utils/utils.hpp"
-#include "assert.hpp"
+#include <libassert/assert.hpp>
 
 #include <iostream>
 #include <filesystem>

source/src/templates.cpp

@@ -6,7 +6,7 @@
     #include <algorithm>
     #include <iomanip>
     #include <map>
-    #include "utils/assert.hpp"
+    #include <libassert/assert.hpp>
 
     #include "utils/envmanager.hpp"
     #include "utils/directories.hpp"

source/src/utils/assert.hpp

@@ -1,13 +0,0 @@
-#ifndef ASSERT_HPP
-#define ASSERT_HPP
-
-#include "output.hpp"
-
-#define ASSERT(condition, message) \
-    if (!(condition)) { \
-        dropshell::error << "Assertion failed: " << message << std::endl; \
-        std::exit(1); \
-    }
-
-
-#endif // ASSERT_HPP

source/src/utils/execute.cpp

@@ -6,7 +6,7 @@
 #include <string>
 #include <cstdlib>
 #include <sstream>
-#include "utils/assert.hpp"
+#include <libassert/assert.hpp>
 
 #include "execute.hpp"
 #include "utils/utils.hpp"