BUG: Read choice only from the controlling terminal, not the previous pipe step stdout

Author: kernc

myba.sh

@@ -175,13 +175,15 @@ _encrypt_file () {
         compress_if_text |
         _encrypt "$_plain_path" > "$ENC_REPO/$_enc_path"
 }
+_bind_tty_fd7 () { if [ -e /dev/tty ]; then exec 7< /dev/tty; else exec 7< /dev/null; fi; }  # Fd 7 used in _decrypt_file
 _decrypt_file () {
     _enc_path="$1"
     _plain_path="$2"
     # Check if the plain file already exists
+    [ ! -d "/proc/$$" ] || [ -e "/proc/$$/fd/7" ]  # Assert fd-7 is available
     if [ -f "$WORK_TREE/$_plain_path" ] && [ -z "${YES_OVERWRITE:-}" ]; then
         warn "WARNING: File '$WORK_TREE/$_plain_path' exists. Overwrite? [y/N]"
-        read _choice
+        read _choice <&7
         case "$_choice" in [Yy]*) ;; *) warn "Skipping '$WORK_TREE/$_plain_path'"; return 0 ;; esac
     fi
     decrypted_tmpfile="$(_mktemp)"
@@ -306,6 +308,7 @@ cmd_decrypt () {
         fi
     else
         quiet _trap_append "git_enc checkout --force master" INT HUP TERM EXIT
+        _bind_tty_fd7
         git_enc rev-list --reverse master |
             while IFS= _read_vars _enc_commit; do
                 # shellcheck disable=SC2154
@@ -602,6 +605,7 @@ cmd_checkout() {
         git_enc sparse-checkout reapply
 
         _ask_pw
+        _bind_tty_fd7
         _parallelize 0 2 _checkout_file < "$working_manifest"
     fi
 }

smoke-test.sh

@@ -77,7 +77,7 @@ title 'Ensure restoration script is present in the encrypted repo'
 stat "$WORK_TREE/.myba/_encrypted/myba.sh"
 title 'No overwrite existing file unless forced'
 myba checkout "foo/.dotfile"
-if myba checkout "foo/.dotfile"; then exit 2; fi
+if setsid myba checkout "foo/.dotfile"; then exit 2; fi
 YES_OVERWRITE=1 myba checkout "foo/.dotfile"
 unset YES_OVERWRITE  # Fix for buggy macOS shell