daemon: fixup exec usage

cachix · Jan 9, 2024 · 108c128 · 108c128
1 parent 5f93ae3
commit 108c128
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/dist/main/index.js b/dist/main/index.js
@@ -7988,7 +7988,7 @@ function getUserConfigDirs() {
 async function isTrustedUser() {
     try {
         let user = os.userInfo().username;
-        let userGroups = await exec.exec('id', ['-Gn', user]).toString().split(' ');
+        let userGroups = await execToVariable('id', ['-Gn', user]).then((str) => str.trim().split(' '));
         let [trustedUsers, trustedGroups] = await fetchTrustedUsers().then(partitionUsersAndGroups);
         // Chech if Nix is installed in single-user mode.
         let isStoreWritable = isWritable('/nix/store');
@@ -8012,7 +8012,7 @@ async function isWritable(path) {
 }
 async function fetchTrustedUsers() {
     try {
-        let conf = await exec.exec('nix show-config').toString();
+        let conf = await execToVariable('nix', ['show-config']);
         let match = conf.match(/trusted-users = (.+);/);
         return match?.length === 2 ? match[1].split(' ') : [];
     }

diff --git a/src/main.ts b/src/main.ts
@@ -306,7 +306,7 @@ function getUserConfigDirs(): string[] {
 async function isTrustedUser(): Promise<boolean> {
   try {
     let user = os.userInfo().username;
-    let userGroups = await exec.exec('id', ['-Gn', user]).toString().split(' ');
+    let userGroups = await execToVariable('id', ['-Gn', user]).then((str) => str.trim().split(' '));
 
     let [trustedUsers, trustedGroups] = await fetchTrustedUsers().then(partitionUsersAndGroups);
 
@@ -333,7 +333,7 @@ async function isWritable(path: string): Promise<boolean> {
 
 async function fetchTrustedUsers(): Promise<string[]> {
   try {
-    let conf = await exec.exec('nix show-config').toString();
+    let conf = await execToVariable('nix', ['show-config']);
     let match = conf.match(/trusted-users = (.+);/)
     return match?.length === 2 ? match[1].split(' ') : [];
   } catch (error) {