Merge branch 'progress-monitor'

loda-lang · May 3, 2022 · 11612b2 · 11612b2
2 parents ad0fd37 + 14ae94b
commit 11612b2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@ To install or update LODA, please follow the [installation instructions](https:/
 
 ## [Unreleased]
 
+# v22.5.3
+
+### Bugfixes
+
+* Fixes setup issues when runing in BOINC
+
 # v22.5.2
 
 ### Enhancements

diff --git a/src/boinc.cpp b/src/boinc.cpp
@@ -51,8 +51,10 @@ void Boinc::run() {
   // clone programs repository if necessary
   if (!Setup::existsProgramsHome()) {
     FolderLock lock(project_dir);
-    if (!Setup::cloneProgramsHome()) {
-      Log::get().error("Cannot clone programs repository", true);
+    if (!Setup::existsProgramsHome()) {  // need to check again here
+      if (!Setup::cloneProgramsHome()) {
+        Log::get().error("Cannot clone programs repository", true);
+      }
     }
   }
 

diff --git a/src/setup.cpp b/src/setup.cpp
@@ -59,6 +59,9 @@ MiningMode convertStrToMiningMode(const std::string& str) {
 }
 
 std::string Setup::getLodaHomeNoCheck() {
+  if (!LODA_HOME.empty()) {
+    return LODA_HOME;
+  }
   auto loda_home = std::getenv("LODA_HOME");
   std::string result;
   if (loda_home) {