aboutsummaryrefslogtreecommitdiff
path: root/src/GlobalLib.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/GlobalLib.cpp')
-rw-r--r--src/GlobalLib.cpp11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/GlobalLib.cpp b/src/GlobalLib.cpp
index 8618cfd..c577a4a 100644
--- a/src/GlobalLib.cpp
+++ b/src/GlobalLib.cpp
@@ -282,13 +282,13 @@ namespace sibs
if (!libPathResult)
return Result<bool>::Err(libPathResult);
FileString libPath = libPathResult.unwrap();
- libPath += TINYDIR_STRING("/.sibs/lib/");
+ libPath += TINYDIR_STRING("/.cache/sibs/lib/");
libPath += toFileString(dependency->name);
libPath += TINYDIR_STRING("/");
libPath += toFileString(dependency->version);
FileString libArchivedFilePath = libPathResult.unwrap();
- libArchivedFilePath += TINYDIR_STRING("/.sibs/archive/");
+ libArchivedFilePath += TINYDIR_STRING("/.cache/sibs/archive/");
libArchivedFilePath += toFileString(dependency->name);
Result<bool> createArchiveDirResult = createDirectoryRecursive(libArchivedFilePath.c_str());
if(!createArchiveDirResult)
@@ -305,7 +305,10 @@ namespace sibs
if(!createLibDirResult)
return createLibDirResult;
- return Archive::extract(libArchivedFilePath.c_str(), libPath.c_str());
+ Result<bool> archiveExtractResult = Archive::extract(libArchivedFilePath.c_str(), libPath.c_str());
+ // We have extracted the archive, we dont need to cache it. If remove fails, it doesn't really matter, user can remove it himself
+ remove(libArchivedFilePath.c_str());
+ return archiveExtractResult;
}
Result<bool> GlobalLib::downloadDependency(GitDependency *dependency)
@@ -314,7 +317,7 @@ namespace sibs
if (!libPathResult)
return Result<bool>::Err(libPathResult);
FileString libPath = libPathResult.unwrap();
- libPath += TINYDIR_STRING("/.sibs/lib/");
+ libPath += TINYDIR_STRING("/.cache/sibs/lib/");
libPath += toFileString(dependency->name);
// We dont care if the directory already exists. Nothing will happen if it does