From d64c613c57d63bcc1c2a9e52329c15ba1a690219 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Mon, 6 May 2024 10:42:31 +0200 Subject: Fix bug in DYNAMIC_ADDRESSES for ssh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- ssh/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssh/Makefile b/ssh/Makefile index e7bf102..be4b0d5 100644 --- a/ssh/Makefile +++ b/ssh/Makefile @@ -3,7 +3,7 @@ DYNAMIC_ADDRESSES != \ for f in ../.secrets/ssh/hostfetch/* ../.work/ssh/hostfetch/* hostfetch/*; do \ test ! -x "$$f" || printf '%s\n' "$$f"; \ - done | sort -u | sed 's|^.*/\([^/]*[^/~]\)$$|\1|' + done | sort -u | sed -n 's|^.*/\([^/]*[^/~]\)$$|\1|p' install: -rm -f -- .ssh-config -- cgit v1.2.3-70-g09d2 From 8ab4a5a0851f58c0e3d62044c3542d1eafa50e2e Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Wed, 22 May 2024 20:48:04 +0200 Subject: ffmpeg/resize-and-transcode: restore tty settings MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- ffmpeg/resize-and-transcode | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffmpeg/resize-and-transcode b/ffmpeg/resize-and-transcode index f3fe017..a8d2001 100755 --- a/ffmpeg/resize-and-transcode +++ b/ffmpeg/resize-and-transcode @@ -99,8 +99,10 @@ if test -z "$scale" && test "$codec" = '-c:v copy'; then exit 1 fi +ttysetting="$(stty -g)" ffmpeg -i "$input" $scale $codec -c:a copy -- "$output" ret=$? +stty -- "$ttysetting" if test $ret = 0; then oldsize=$(stat -c '%s' -- "$input") -- cgit v1.2.3-70-g09d2 From 52bbc710030e0a6015e633cc589aac0228986ad8 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Fri, 14 Jun 2024 15:14:25 +0200 Subject: Fix printf usage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- ffmpeg/resize-and-transcode | 2 +- ffmpeg/resize-and-transcode-recursively | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ffmpeg/resize-and-transcode b/ffmpeg/resize-and-transcode index a8d2001..2b7b962 100755 --- a/ffmpeg/resize-and-transcode +++ b/ffmpeg/resize-and-transcode @@ -13,7 +13,7 @@ err () { colour="$1" format="$2" shift 2 - printf '\x1b['"${colour}m${format}"'\x1b[m\n' "$@" >&2 + printf '\033['"${colour}m${format}"'\033[m\n' "$@" >&2 } alert () { err "1;31" "$@"; } diff --git a/ffmpeg/resize-and-transcode-recursively b/ffmpeg/resize-and-transcode-recursively index 8a7a207..c420de3 100755 --- a/ffmpeg/resize-and-transcode-recursively +++ b/ffmpeg/resize-and-transcode-recursively @@ -12,7 +12,7 @@ err () { colour="$1" format="$2" shift 2 - printf '\x1b['"${colour}m${format}"'\x1b[m\n' "$@" >&2 + printf '\033['"${colour}m${format}"'\033[m\n' "$@" >&2 } alert () { err "1;31" "$@"; } -- cgit v1.2.3-70-g09d2