Aura - Add Aura::setEnvVar() Function

NickvisionApps · Dec 25, 2023 · 82c2502 · 82c2502
1 parent b6a6195
commit 82c2502
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/include/aura.h b/include/aura.h
@@ -65,6 +65,13 @@ namespace Nickvision::Aura
 		 * @return The environment variable if found, else empty string
 		 */
 		static std::string getEnvVar(const std::string& key);
+		/**
+		 * @brief Sets a system environment variable.
+		 * @param key The environment variable to set
+		 * @param value The value for the environment variable
+		 * @return True if set, else false
+		 */
+		static bool setEnvVar(const std::string& key, const std::string& value);
 
 	private:
 		static std::unique_ptr<Aura> m_instance;

diff --git a/src/aura.cpp b/src/aura.cpp
@@ -1,6 +1,9 @@
 #include "aura.h"
 #include <cstdlib>
 #include <stdexcept>
+#ifdef __linux__
+#include <stdlib.h>
+#endif
 
 namespace Nickvision::Aura
 {
@@ -44,4 +47,14 @@ namespace Nickvision::Aura
 		}
 		return "";
 	}
+
+	bool Aura::setEnvVar(const std::string& key, const std::string& value)
+	{
+#ifdef _WIN32
+		std::string var{ key + "=" + value };
+		return _putenv(var.c_str()) == 0;
+#elif defined(__linux__)
+		return setenv(key.c_str(), value.c_str(), true) == 0;
+#endif
+	}
 }
diff --git a/tests/networktests.cpp b/tests/networktests.cpp
@@ -1,9 +1,8 @@
 #include <gtest/gtest.h>
+#include "aura.h"
 #include "network/networkmonitor.h"
-#ifdef __linux__
-#include <stdlib.h>
-#endif
 
+using namespace Nickvision::Aura;
 using namespace Nickvision::Aura::Network;
 
 TEST(NetworkTests, ConnectedGlobal)
@@ -18,11 +17,7 @@ TEST(NetworkTests, ConnectedGlobal)
 
 TEST(NetworkTests, DisableNetCheck)
 {
-#ifdef _WIN32
-	ASSERT_EQ(_putenv("AURA_DISABLE_NETCHECK=true"), 0);
-#elif defined(__linux__)
-	ASSERT_EQ(setenv("AURA_DISABLE_NETCHECK", "true", true), 0);
-#endif
+	ASSERT_TRUE(Aura::setEnvVar("AURA_DISABLE_NETCHECK", "true"));
 	NetworkMonitor netmon;
 	netmon.stateChanged() += [](const NetworkStateChangedEventArgs& e)
 	{