From 29b3ff8b45148931c9f98acccf7a109729f97fc8 Mon Sep 17 00:00:00 2001
From: pvincent <pvincent@artcode.re>
Date: Mon, 17 Aug 2026 21:40:39 +0400
Subject: [PATCH] install2

---
 bin/miaou-bash          |  6 +++++-
 etc/bash.bashrc         |  9 ++++-----
 install2.sh             | 38 ++++++++++++++++++++++----------------
 lib/initiate.bash       |  2 +-
 test/stub/scenario.bash |  3 +--
 5 files changed, 33 insertions(+), 25 deletions(-)

diff --git a/bin/miaou-bash b/bin/miaou-bash
index d5634ff..b6ae4d3 100755
--- a/bin/miaou-bash
+++ b/bin/miaou-bash
@@ -615,6 +615,10 @@ function usage {
   echo "$(basename "$0") <SCRIPT> [...SCRIPT_ARGS] | --version | --help | --self-upgrade | --initiate | --uninstall"
 }
 
+function version {
+  cat "${MIAOU_BASH_DIR:-/opt/miaou-bash}/.semver_git_tag"
+}
+
 function parse_options {
   HEREDOC=false
   if [[ $# == 0 ]]; then
@@ -628,7 +632,7 @@ function parse_options {
   elif [[ $# == 1 ]]; then
     case "$1" in
     --help) usage && builtin exit ;;
-    --version) cat "${MIAOU_BASH_DIR:-/opt/miaou-bash}/.semver_git_tag" && builtin exit ;;
+    --version) version && builtin exit ;;
     --self-upgrade) self_upgrade && builtin exit ;;
     --uninstall) uninstall && builtin exit ;;
     -*) >&2 echo "ERROR: option '$1' unknown!" && usage && builtin exit 2 ;;
diff --git a/etc/bash.bashrc b/etc/bash.bashrc
index b3ed6c2..603d3be 100644
--- a/etc/bash.bashrc
+++ b/etc/bash.bashrc
@@ -202,11 +202,10 @@ if ! shopt -oq posix; then
   fi
 fi
 
-# prevent CTRL+S to freeze in vim, CTRL+Q to unfreeze!
-stty -ixon
-
-# release CTRL+U to readline processing => undo
-stty kill undef
+if [[ -t 0 ]]; then
+  stty -ixon      # prevent CTRL+S to freeze in vim, CTRL+Q to unfreeze!
+  stty kill undef # release CTRL+U to readline processing => undo
+fi
 
 PROMPT_COMMAND='__prompt_command' # Func to gen PS1 after CMDs
 
diff --git a/install2.sh b/install2.sh
index b7f956d..296f0da 100755
--- a/install2.sh
+++ b/install2.sh
@@ -1,4 +1,5 @@
 #!/usr/bin/bash -E
+# shellcheck disable=all
 
 ## CONSTANTS
 
@@ -9,36 +10,41 @@ MAIN_TAR_GZ_URL="https://git.artcode.re/miaou/miaou-bash/archive/main.tar.gz"
 function bootstrap {
   cd "$(mktemp -d)" || exit 3
   curl -s -O $MAIN_TAR_GZ_URL
-  tar -xzf main.tar.gz --directory "$(dirname $MIAOU_BASH_DIR)"
+  tar -xzf main.tar.gz --directory $(dirname "$MIAOU_BASH_DIR")
+  . "$MIAOU_BASH_DIR"/bin/miaou-bash "$MIAOU_BASH_DIR/lib/initiate.bash"
 }
 
 function assert_supported_distro {
-  grep -E '^ID=debian|^ID_LIKE=debian' /etc/os-release ||
-    grep -E '^ID=arch|^ID_LIKE=arch' /etc/os-release
+  if ! grep -E '^ID=debian|^ID_LIKE=debian' /etc/os-release &&
+    ! grep -E '^ID=arch|^ID_LIKE=arch' /etc/os-release; then
+    local distro=$(grep -oP '^ID=\K(.*)' /etc/os-release)
+    >&2 echo "unsupported GNU/Linux distribution: $distro"
+    >&2 echo 'only debian-like OR arch-like currently supported'
+    exit 2
+  fi
+}
+
+function once_installed {
+  [[ -d "$MIAOU_BASH_DIR" &&
+    -L /etc/inputrc &&
+    "$(readlink /etc/inputrc)" == "$MIAOU_BASH_DIR"/etc/inputrc ]]
 }
 
 ## MAIN
 
 set -Eeuo pipefail
 
-! assert_supported_distro && echo 'unsupported distro: debian-like OR arch-like expected' && exit 2
+assert_supported_distro
 deployment_type_adjective="${1:-installed}"
 [[ ! -v MIAOU_BASH_DIR ]] && MIAOU_BASH_DIR=/opt/miaou-bash && export MIAOU_BASH_DIR
 
 if [[ "$UID" -ne 0 ]]; then
-  sudo -vp 'root privilege required: '
+  sudo -vp 'root privilege required (SUDO): '
   curl -s https://git.artcode.re/miaou/miaou-bash/raw/branch/main/install2.sh | sudo bash
-  echo DONE with root, now refresh bash login
   source /etc/profile
-  source /etc/bash.bashrc
-  exec bash -l
+elif once_installed; then
+  . "$MIAOU_BASH_DIR"/bin/miaou-bash "$MIAOU_BASH_DIR/lib/self-upgrade.bash"
 else
-  if [[ -d "$MIAOU_BASH_DIR" && -L /etc/inputrc && "$(readlink /etc/inputrc)" == "$MIAOU_BASH_DIR"/etc/inputrc ]]; then
-    . "$MIAOU_BASH_DIR"/bin/miaou-bash "$MIAOU_BASH_DIR/lib/self-upgrade.bash"
-  else
-    bootstrap
-    . "$MIAOU_BASH_DIR"/bin/miaou-bash "$MIAOU_BASH_DIR/lib/initiate.bash"
-    echo "miaou-bash successfully $deployment_type_adjective"
-    exec bash -l
-  fi
+  bootstrap
+  echo "miaou-bash successfully $deployment_type_adjective"
 fi
diff --git a/lib/initiate.bash b/lib/initiate.bash
index 3933c2a..c1739f2 100644
--- a/lib/initiate.bash
+++ b/lib/initiate.bash
@@ -96,7 +96,7 @@ function link_config_files {
 
 function force_reload {
   bind -f /etc/inputrc 2>/dev/null # arch: dismiss harmless warning
-  source /etc/bash.bashrc
+  source /etc/profile
 }
 
 function in_azerty_zone {
diff --git a/test/stub/scenario.bash b/test/stub/scenario.bash
index f27e075..7227c24 100755
--- a/test/stub/scenario.bash
+++ b/test/stub/scenario.bash
@@ -22,8 +22,7 @@ EOF
 }
 
 function do_pipe1 {
-  # miaou-bash < <(...)
-  source /dev/stdin < <(echo 'echo PIPE1')
+  source <(echo 'echo PIPE1')
 }
 
 function do_pipe2 {