From ef081d27aa1b34ce7bee69cb1e845423f626ff4a Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 16 Nov 2020 10:43:08 +0100 Subject: [PATCH] Try to get the location of the sync folder from the OPENSPACE_SYNC environment variable first, before using the ${BASE}/sync Update SGCT repository --- apps/OpenSpace/ext/sgct | 2 +- ext/ghoul | 2 +- openspace.cfg | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index cef10f55bd..6c351ebf2e 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit cef10f55bda2c683a936159e97c43a9104c03fb1 +Subproject commit 6c351ebf2e7a1106982502f4050363f31ac3d0a3 diff --git a/ext/ghoul b/ext/ghoul index 7814e7d3be..68af9b6971 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 7814e7d3be623a229ce3fb95754f0e8d2923c958 +Subproject commit 68af9b6971e1e6447fa63afe3ea9918bb0e5c6d3 diff --git a/openspace.cfg b/openspace.cfg index 4410c6c261..ab32afd02f 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -95,7 +95,11 @@ Paths = { PROFILES = "${DATA}/profiles", FONTS = "${DATA}/fonts", TASKS = "${DATA}/tasks", - SYNC = "${BASE}/sync", + -- If the the 'OPENSPACE_SYNC' environment variable is defined on the system, use that + -- value. Otherwise, fall back to the ${BASE}/sync folder instead. This allows a + -- reuse of the sync folder between multiple OpenSpace installations by simply setting + -- that environment variable + SYNC = os.getenv("OPENSPACE_SYNC") or "${BASE}/sync2", SCREENSHOTS = "${BASE}/screenshots", WEB = "${DATA}/web", RECORDINGS = "${BASE}/recordings",