meta: Bump cutekit and allow the tool to be installed.

meta/plugins/requirements.txt

@@ -1,2 +1,2 @@
-git+https://github.com/cute-engineering/cutekit.git@0.7.10
+git+https://github.com/cute-engineering/cutekit.git@0.7.12
 Markdown~=3.7

src/impls/impl-posix/pkg.cpp

@@ -6,7 +6,17 @@
 namespace Karm::Pkg::_Embed {
 
 Res<Vec<String>> installedBundles() {
-    auto repoRoot = try$(Mime::parseUrlOrPath(try$(Posix::repoRoot())));
+    auto [repo, format] = try$(Posix::repoRoot());
+    Mime::Url repoRoot;
+    if (format == Posix::RepoType::CUTEKIT) {
+        repoRoot = Mime::Url::parse(repo);
+    } else if (format == Posix::RepoType::PREFIX) {
+        repoRoot = Mime::Url::parse(repo)
+                       .join("share");
+    } else {
+        return Error::notFound("unknown repo type");
+    }
+
     auto dirs = try$(Sys::_Embed::readDir(repoRoot));
     Vec<String> ids;
     for (auto& dir : dirs) {

src/impls/impl-posix/sys.cpp

@@ -42,15 +42,25 @@ Res<Mime::Path> resolve(Mime::Url const& url) {
 
         resolved = Mime::Path::parse(runtimeDir).join(path);
     } else if (url.scheme == "bundle") {
-        auto repo = try$(Posix::repoRoot());
+        auto [repo, format] = try$(Posix::repoRoot());
 
         auto path = url.path;
         path.rooted = false;
 
-        resolved = Mime::Path::parse(repo)
-                       .join(url.host)
-                       .join("__res__")
-                       .join(path);
+        if (format == Posix::RepoType::CUTEKIT) {
+            resolved = Mime::Path::parse(repo)
+                           .join(url.host)
+                           .join("__res__")
+                           .join(path);
+        } else if (format == Posix::RepoType::PREFIX) {
+            resolved = Mime::Path::parse(repo)
+                           .join("share")
+                           .join(url.host)
+                           .join(path);
+            logDebug("resolved bundle path: {}", resolved);
+        } else {
+            return Error::notFound("unknown repo type");
+        }
     } else if (url.scheme == "location") {
         auto* maybeHome = getenv("HOME");
         if (not maybeHome)

src/impls/impl-posix/utils.cpp

@@ -251,21 +251,31 @@ struct timespec toTimespec(TimeSpan ts) {
     return pts;
 }
 
-Res<Str> repoRoot() {
+Res<Tuple<Str, RepoType>> repoRoot() {
     auto* maybeRepo = getenv("CK_BUILDDIR");
+    if (maybeRepo) {
+        return Ok(Tuple<Str, RepoType>{
+            Str::fromNullterminated(maybeRepo),
+            RepoType::CUTEKIT,
+        });
+    }
 
-    if (not maybeRepo)
-        maybeRepo = getenv("SKIFT_BUNDLES");
+    maybeRepo = getenv("SKIFT_BUNDLES");
+    if (maybeRepo) {
+        return Ok(Tuple<Str, RepoType>{
+            Str::fromNullterminated(maybeRepo),
+            RepoType::CUTEKIT,
+        });
+    }
 
-#ifdef __ck_prefix__
-    if (not maybeRepo)
-        maybeRepo = __ck_prefix__;
+#ifdef __ck_prefix_value
+    return Ok(Tuple<Str, RepoType>{
+        stringify$(__ck_prefix_value) ""s,
+        RepoType::PREFIX,
+    });
 #endif
 
-    if (not maybeRepo)
-        return Error::notFound("SKIFT_BUNDLES not set");
-
-    return Ok(Str::fromNullterminated(maybeRepo));
+    return Error::notFound("SKIFT_BUNDLES not set");
 }
 
 } // namespace Posix

src/impls/impl-posix/utils.h

@@ -28,6 +28,11 @@ struct timespec toTimespec(TimeStamp ts);
 
 struct timespec toTimespec(TimeSpan ts);
 
-Res<Str> repoRoot();
+enum struct RepoType {
+    CUTEKIT,
+    PREFIX
+};
+
+Res<Tuple<Str, RepoType>> repoRoot();
 
 } // namespace Posix