From 669b9ac56a1b07b44fa73d9fc57d7a9614d4a109 Mon Sep 17 00:00:00 2001 From: Matthieu Jolimaitre Date: Fri, 1 Aug 2025 10:10:57 +0200 Subject: [PATCH] make progress report on a separate line to avoid fighting with command for current line. --- package/deploy | 2 ++ src/regar.ts | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) mode change 100644 => 100755 package/deploy diff --git a/package/deploy b/package/deploy old mode 100644 new mode 100755 index d4d25d0..1de4c8c --- a/package/deploy +++ b/package/deploy @@ -2,5 +2,7 @@ set -e cd "$(dirname "$(realpath "$0")")" +rm -fr release/tmp ./release/package +rm -fr aur/tmp ./aur/package diff --git a/src/regar.ts b/src/regar.ts index 0cc522a..54ae761 100755 --- a/src/regar.ts +++ b/src/regar.ts @@ -5,7 +5,7 @@ import { Command } from "https://deno.land/x/cliffy@v1.0.0-rc.4/command/mod.ts" import { Channel, Constructible, InstanceOf } from "https://git.barnulf.net/mb/barnulf_ts/raw/branch/master/mod.ts" import { wait } from "https://git.barnulf.net/mb/barnulf_ts/raw/branch/master/src/lib/utils.ts" -const version = "1.1.0" +const version = "1.1.1" async function main() { const { do_clear, command, extensions, files, strategy, go_up, show_progress } = await parse_args() @@ -123,6 +123,7 @@ class Runner { if (this.go_up) this.restore_cursor() if (stop !== undefined) stop.stop = true log("terminated", `${secs} s`) + console.log("\x1b[2K\x1bM") } } @@ -143,7 +144,9 @@ class Runner { const secs = (Math.floor(step.ms / 100) / 10).toString().padStart(3) const total = Math.floor(this.time_estimation_ms / 1_000).toString().padStart(3) const perc = (Math.floor(step.relative * 1_000) / 10).toString().padStart(5) - log("progress", `${secs} s / ${total} s (${perc} %)\x1bM`) + console.log("") + log("progress", `${secs} s / ${total} s (${perc} %)`) + console.log("\x1bM\x1bM\x1bM") } })()