From 07c61562b4c9ba449e85508da71320f0e4fa3e09 Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <luca@spacehb.net>
Date: Tue, 22 Apr 2025 10:02:39 +0200
Subject: checkpoint

---
 bin/common/gt-cmd |  7 +++++--
 bin/extra/confirm | 16 +++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'bin')

diff --git a/bin/common/gt-cmd b/bin/common/gt-cmd
index 56b8df6..ebfe301 100755
--- a/bin/common/gt-cmd
+++ b/bin/common/gt-cmd
@@ -34,8 +34,11 @@ then
 
 	if ! ssh-add -L | grep "$(cat "$Keyfile")" > /dev/null
 	then
-		printf '%s: '\''%s'\'' not in ssh-agent\n' "$repo_pretty" "$r" 
-		exit 1
+		if ! keyadd "$r" > /dev/null 2>&1
+		then
+			printf '%s: '\''%s'\'' not in ssh-agent\n' "$repo_pretty" "$r" 
+			exit 1
+		fi
 	fi
 fi
 
diff --git a/bin/extra/confirm b/bin/extra/confirm
index 630d701..7c653b9 100755
--- a/bin/extra/confirm
+++ b/bin/extra/confirm
@@ -1,12 +1,6 @@
 #!/bin/sh
-
-read_char ()
-{
-	old_stty_cfg=$(stty -g 2> /dev/null)
-	stty raw -echo  2> /dev/null
-	dd ibs=1 count=1 2> /dev/null
-	stty "$old_stty_cfg" 2> /dev/null
-}
-
->&2 printf "%s " "$1" 
-read_char | grep -q "[yY]"
+trap 'exit' INT
+old_stty_cfg=$(stty -g 2> /dev/null)
+stty raw -echo  2> /dev/null
+dd ibs=1 count=1 2> /dev/null
+stty "$old_stty_cfg" 2> /dev/null
-- 
cgit v1.2.3