fix APPDIR env bug

iku-iku-iku · Dec 21, 2023 · 32d2f73 · 32d2f73
1 parent facd9ae
commit 32d2f73
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/ZpodsLib/src/base/compress.h b/ZpodsLib/src/base/compress.h
@@ -165,7 +165,7 @@ struct fmt::formatter<Code>
     template <typename FormatContext>
     auto format(const Code& p, FormatContext& ctx) const
     {
-        return format_to(ctx.out(), "0b{:0{}b}", p.bits, p.len);
+        return fmt::format_to(ctx.out(), "0b{:0{}b}", p.bits, p.len);
     }
 };
 

diff --git a/ZpodsLib/src/core/zpods_core.h b/ZpodsLib/src/core/zpods_core.h
@@ -225,7 +225,7 @@ struct fmt::formatter<zpods::Pea>
     template <typename FormatContext>
     auto format(const zpods::Pea& p, FormatContext& ctx) const
     {
-        return format_to(ctx.out(), "rel_path: {}, last_modified_ts: {}",
+        return fmt::format_to(ctx.out(), "rel_path: {}, last_modified_ts: {}",
                          p.rel_path, p.last_modified_ts);
     }
 };

diff --git a/network/client/grpc_client.cpp b/network/client/grpc_client.cpp
@@ -9,7 +9,13 @@ ABSL_FLAG(std::string, target, "127.0.0.1:50051", "Server address");
 auto MakeClientSslCredentials()
 {
     auto ReadFile = [](const std::string& filename) {
-        let filepath = zpods::fs::path(getenv("APPDIR")) / filename;
+        let filepath = filename;
+
+        const char* appDir = getenv("APPDIR");
+        if(appDir != nullptr)
+        {
+            filepath = zpods::fs::path(getenv("APPDIR")) / filename;
+        }
 
         std::ifstream file(filepath);
         std::stringstream buffer;

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+mkdir tmp
 cd build
 ./ZpodsLib/test/zpods_lib_test
 cd ..
+rm -rf tmp