From f86a908952c5ae34a0e2ac832ffe43cb4d0ae0cc Mon Sep 17 00:00:00 2001 From: Aylur Date: Wed, 31 Jul 2024 16:07:48 +0200 Subject: fix(process): exec throw stdout as error --- gjs/src/process.ts | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) (limited to 'gjs/src') diff --git a/gjs/src/process.ts b/gjs/src/process.ts index f7ff7b0..577ad99 100644 --- a/gjs/src/process.ts +++ b/gjs/src/process.ts @@ -1,4 +1,4 @@ -import { Astal } from "./imports.js" +import { Astal, GLib } from "./imports.js" type Args = { cmd: string | string[] @@ -36,23 +36,11 @@ export function subprocess( return proc } -export function exec( - args: Args -): Out | Err -export function exec( - cmd: string | string[], - onOut?: (stdout: string) => Out, - onErr?: (stderr: string) => Err, -): Out | Err -export function exec( - argsOrCmd: Args | string | string[], - onOut: (stdout: string) => Out = out => out as Out, - onErr: (stderr: string) => Err = out => out as Err, -): Out | Err { - const { cmd, err, out } = args(argsOrCmd, onOut, onErr) +/** @throws {GLib.Error} Throws stderr */ +export function exec(cmd: string | string[]) { return Array.isArray(cmd) - ? out(Astal.Process.execv(cmd)!) as Out - : err(Astal.Process.exec(cmd)!) as Err + ? Astal.Process.execv(cmd) + : Astal.Process.exec(cmd) } export function execAsync(cmd: string | string[]): Promise { -- cgit v1.2.3