Merge changes I5566a985,I88cf53d3 into main

* changes:
  Support relative and `~/` paths in config settings
  Thread `ApplyConfigOptions` through config parsing

1 files changed, 15 insertions, 0 deletions

diff --git a/src/libutil/file-system.cc b/src/libutil/file-system.cc
index 1d266067e..8c69c9864 100644
--- a/src/libutil/file-system.cc
+++ b/src/libutil/file-system.cc
@@ -118,6 +118,21 @@ Path realPath(Path const & path)
     return ret;
 }
 
+Path tildePath(Path const & path, const std::optional<Path> & home)
+{
+    if (path.starts_with("~/")) {
+        if (home) {
+            return *home + "/" + path.substr(2);
+        } else {
+            throw UsageError("`~` path not allowed: %1%", path);
+        }
+    } else if (path.starts_with('~')) {
+        throw UsageError("`~` paths must start with `~/`: %1%", path);
+    } else {
+        return path;
+    }
+}
+
 void chmodPath(const Path & path, mode_t mode)
 {
     if (chmod(path.c_str(), mode) == -1)