move ask to loadConsole

tek · Oct 16, 2023 · 23e2f95 · 23e2f95
1 parent 3c91355
commit 23e2f95
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/lib/default.nix b/lib/default.nix
@@ -139,6 +139,10 @@ let
   {
     echo -e "${chevrons} $*"
   }
+  message_part()
+  {
+    echo -n -e "${chevrons} $*"
+  }
   error_message()
   {
     echo -e "${chevrons} ${color colors.red "\${*}"}"
@@ -156,6 +160,14 @@ let
     error_message $*
     exit 1
   }
+  ask() {
+    setopt local_options no_err_exit no_err_return
+    local decision=""
+    message_part "$1 [Yn] "
+    read -k decision
+    echo ""
+    [[ $decision != 'n' ]]
+  }
   '';
 
 in {

diff --git a/lib/release.nix b/lib/release.nix
@@ -19,13 +19,6 @@
   then
     die 'Worktree is dirty'
   fi
-
-  ask() {
-    echo -n "$chevrons $1 [Yn] "
-    read -q decision || true
-    echo ""
-    [[ $decision != 'n' ]]
-  }
   '';
 
   updateVersions = ''