daemon: fix reading trusted-users

cachix · Jan 9, 2024 · 711a732 · 711a732
1 parent 8426524
commit 711a732
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
@@ -8017,7 +8017,7 @@ async function isWritable(path) {
 async function fetchTrustedUsers() {
     try {
         let conf = await execToVariable('nix', ['show-config'], { silent: true });
-        let match = conf.match(/trusted-users = (.+);/);
+        let match = conf.match(/trusted-users = (.+)/m);
         return match?.length === 2 ? match[1].split(' ') : [];
     }
     catch (error) {

diff --git a/src/main.ts b/src/main.ts
@@ -337,8 +337,8 @@ async function isWritable(path: string): Promise<boolean> {
 
 async function fetchTrustedUsers(): Promise<string[]> {
   try {
-    let conf = await execToVariable('nix', ['show-config'], { silent: true })
-    let match = conf.match(/trusted-users = (.+);/)
+    let conf = await execToVariable('nix', ['show-config'], { silent: true });
+    let match = conf.match(/trusted-users = (.+)/m);
     return match?.length === 2 ? match[1].split(' ') : [];
   } catch (error) {
     core.warning('Failed to read the Nix configuration');