gentoo auto-resync : 01:07:2024 - 08:00:50

7 files changed, 107 insertions, 67 deletions

diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 5a504ad43782..ec1d24529fe3 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 8ac0caf9f49e..2f0d70158d72 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -9,7 +9,7 @@ AUX bash_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15c
 AUX bashrc 3494 BLAKE2B e9379c18fca85666cd347d1d8cf5c9859c5865ad7a3ded1ac5724bad6117924231e89dcc21f1a80931591e9a39c1acc3f7be8b2afe38986ea34b3b8fc12f5814 SHA512 a8fa416ab9265055e778fad3e4190ab5f57da0823c12d60a915bb77ba701fe93df8d16e041dd5747ed9db899a2516451b803db648aed0f85f0abb6d98c9414b8
 AUX bashrc-r1 894 BLAKE2B ffaebc59c403b815df246342564e7d871f0c5eda437f7d63cef42ed2041912bd61722cab3034342fcb0336b48d9a14ada74052e52f02774695fc3e968c6feaae SHA512 82972cd0feede88c679fe8690da4884e8efa3decfc3bb72404fbd1129364f0092d2edfb1c6cc1f5adf783a6deca64a82c670a8b034ac0c3f85742a67306aa36b
 AUX bashrc.d/10-gentoo-color.bash 2209 BLAKE2B 8f01349bcb9814fc371debdda7bc6158a51b285938426fef5f6427ed40df0ae480c3d5318df30f72bf854c07e0da619d3e2cdb46927cbfdc58d3eb8cb3a305ba SHA512 697cb742378f8fbe6073e8457cc92d83b21606fe45b2779436bc6a874847cef80168d84c413d8c04b0062840e8720967d94877839599ea819d7547afc891934c
-AUX bashrc.d/10-gentoo-title.bash 1851 BLAKE2B 8fdc28e87ff440a085d72c974cd75a280eb7f422541e703a42aee26515fd4df5887b464fb7db822a5de8b35335b0c72310ca6b91e1de182dc80e01eeec379f20 SHA512 d7c22607be1322c5f5209f12f6c80177fbf723288093c79a05988a3ed6842b8bbb151edd825ed0bf143df36b975c58da4fcc55f244f1b56f34b23d6883956fc1
+AUX bashrc.d/10-gentoo-title.bash 1970 BLAKE2B 4a54dbc7a9ab6a7be7f62e082c1a218e62d74cebdc7785a7e9fbc0713dfa4594209522c4097a1ff54f4fd56c1b16a17a6282163db6bd9240250d51a890beb877 SHA512 56d4517fb908b86d7de83ee354883890d580b74bf54931b56b399372f5e02020dcb54d5a7511979fe3deb5aaa9fea39ac1d7e9c85e8ba7847de5f6a0d75fd44a
 AUX bashrc.d/15-gentoo-bashrc-check.bash 1002 BLAKE2B b104e871329de47ac82941ca7ff9b03e2e66779603145dcae103052344b207306438cd3023d36255aca2b5fe53a7dc48d42e06e7e1d764ab0ad420b29c2e1650 SHA512 9134a27e234fe2ec0c27f99c83a9a8ac2b3209c766cb7ffbee47dac4c378178844c2c66851b8b114f43e1b4d9790e21121c33ba48cac1bc0a8f2ca06fe841d80
 AUX dot-bash_logout 127 BLAKE2B 8290778aea3426f4c56e5a9e7328faa76f99001fc7ce3eeb3ec26624edcd918d7e946da9a63ffcd0cf0f739b528ccb9e764d448276fe4344b69ef2036fdd9921 SHA512 e0248b5087656a4dd3a4790ed8e6101866b922ccab36b510b3bf408dc0c583e70f323fbad0392e4ea6ca5dcbe73568733e0c0aa9c8ce6b00ff5f72bf3e9fd8fd
 AUX dot-bash_profile 204 BLAKE2B cdb5ece2bea3b47651e2c9ca8d48ef3b0c4b7e2d660632d79edf3cdcea8f5f5a061019739b977538b25f2ace9dcb46e25b30e2d566ea71f6c1ac05388e59c957 SHA512 97ad83696b7eb8b084a53530d1a3e7648722ae4199c91737ceb02b8238e7637b0770731f5140ffb552142311f79b140a041d7e1e5366ba60399b0019f164fce9
@@ -453,9 +453,9 @@ EBUILD bash-4.2_p53.ebuild 5157 BLAKE2B 1a58f67c384b6ae781e48ddc2fb131086a23b449
 EBUILD bash-4.3_p48-r2.ebuild 6358 BLAKE2B 532802911ced386ccff0594e5eee739d0d5ebba7e0bf89c431e2769ca7b2dc48f77787f12bcb327f9d394d3bd80680889968c3708ff9f7e64615347fcfd521f5 SHA512 62ed893e23d65d17d0f83d812e616511b4ff2d69a52e6bffb3ed421bb339d18a213a2f1da0239b108e3e81cf0b2f61b4e0cf535964f40dc4577d0cff226fd9bd
 EBUILD bash-4.4_p23-r2.ebuild 6356 BLAKE2B 7501ac7628fcd2f35d9ca6c2153190d2524545f38a9eb793cd8b9d30ed5cb4ae11078cd7bc940fe3cda3f62797ed53de5ab82f726219c054cdc8779a011a8ea9 SHA512 9b9d12e1408944d18c698b0be9940618c059599138f10b20ed55dc69131aac900e3cae0e0b79a55e77d075f6a03c2970b6d22250afe5c7912c652800fe9a30ef
 EBUILD bash-5.0_p18-r2.ebuild 7680 BLAKE2B 6a615f5ef093b32e85bfe8a0fd270d9c636c5d178ba518a8382e1ad5f0a2e128ad85fec1c8441c416c836bdf83ad5ad0e154f79792a908fd6a97ef23750b1800 SHA512 43a8e61a3b754c5ff25a4c7c6c62c07be626c0e9c1515fcfa8a15e25a3b0aff9fa4d00275c2d64bcb506417a7babb6ee120cde118fd7c9255fade7245adeaaae
-EBUILD bash-5.1_p16-r12.ebuild 10018 BLAKE2B 79618a397c0af05487391a499224fb86b8328bcc89f8529908ecbb69cb07423a4cf5b0e180d94d9cd99bff75fdaac9b97a6adbd8f2c47f77dc7bb1460c6396a7 SHA512 8acf7151c3da8087436b8a9dd222e562100325260e46dbf20db1fa41a23a62ef78edaa1606b90b3fd9f550d30c3090c900b01436109a5c210f762916f2e59f90
+EBUILD bash-5.1_p16-r13.ebuild 10298 BLAKE2B b3b7bc3a466859b81e86b2201de8cdb4860489130f9fdad706765fd831ef737653a02f87b695996911c81ae625bf316b48d8c7e77df716f7c599f1111afff26c SHA512 055daf893bb43c30261b7ecbaed645b72eb0c5029d24f2922f53c65989ae5f23b56057f60645b4065483d9bb7256ad861ac7992642c5632dbe8b64e77b7eff20
 EBUILD bash-5.1_p16-r6.ebuild 8999 BLAKE2B e9208661767c61fbd9b06a61111db58908897bdb2d722b7ccbe5d79cd6d2e2543b6c1c89688e62f51ecdb36f107e74727dc6985396a20d8db8682c9036a6db7d SHA512 3fa9c420bbbc154569eb2a9ebb96681b4f10bb6cdbec43608d171f1d9c46a169d7f6cf8b3f419ff395ebe5dee852fa8c46ccd74c10ee9f0f10a6a281da679f5d
-EBUILD bash-5.2_p26-r5.ebuild 11413 BLAKE2B 43e12bcaf5c213f7a86bbd436c9e64a02aca27202fca939865b6406f2fcf8ae26e893ac44a0bc75cb4458e4d07f019788b3d7b2cb4540e1a6fd9af1fcabdf7c2 SHA512 e9cd0e868d32bf60b9404e45deb43df044890e4e30b36cfb199ee91ce41622d0abec38509047681d2ab44de1a6199b5e0728632aa0c28a2a54c07a6ab4c60aa5
-EBUILD bash-5.3_alpha-r4.ebuild 11286 BLAKE2B b8b8fa80219b8799585f4154703dec6403416e70fa988ede46381231055545e93edcca0ccb277a21a753f4d155a45ddea9be807180e6dbbcd8f8bc82d63f0792 SHA512 5e804e90744b06821be9e2d19bac5d18f090bf3651dc7bd110a08300f8a9f6f1a249aba6f1d5f251eb3c184fdd3a8b4d279ccff0bc082dbb96e4cfafc14666bb
-EBUILD bash-9999.ebuild 11144 BLAKE2B 03af226452f1f1a1527e00e53d5f5a8db9397d952a1d937d953825aa75e9d204d5e39772ebe1fcce48e82152a568d56a960479a8e3e5a30f3afb3eea17defde6 SHA512 1fd2714511a0600c793901725cefd59a764fe256dcbac8dee9004aa7415d6d7df6631165dafecff3d487430baeefd645c1416935a8282da94f8c14c37a3e66ae
+EBUILD bash-5.2_p26-r6.ebuild 11693 BLAKE2B 7c95bd57481d0cc1c1765b1369178367e1fda1fea39da0e4bec48cd17a2feb21718551bc6b8750807c2f74d885e07eb337a3f11e4d9775dd4eba95191aa3ce51 SHA512 df4385c766d6db4183db901f363389c5ac6dbff09e131743db2439942b2fb43440b2a50e77233b5980509d02139eabd91a9083746cfd268eaf42a205ffdc9c30
+EBUILD bash-5.3_alpha-r5.ebuild 11566 BLAKE2B ab99c9907fce433ca5f21140c311b693ecdf4e2bb5356e16d3dc13c986f6f32284f7121b07a17340fdf2890ac8108e6c3dab0bcb3446f66447f741fd5e50c342 SHA512 8706a6346161c7a3159593f9bfcae1bb16c08f22bff648b6580f33708246f3eee2f7f3cd97eca8fd315b7b8f7daf22fcd4b7814e536a9c34d211738cccd36918
+EBUILD bash-9999.ebuild 11516 BLAKE2B 2aede2b5d922fa6113da3f2d2dc372787374ffcdfa3ecb4803bc32e81ae96fd70a2349eb6708846011b9e555e3b7e94dfb97077d68ed0b1629df5992df98a90b SHA512 dc358a2f67639624483331d7883ebf5aa3320bf29a3ceb70464b61f768229be7cef68043b996e60385c8a853b1c1692d5da02a53e5a45765e2cde60fc9869ac8
 MISC metadata.xml 1009 BLAKE2B f71587b0a6d05b907f82b26be93b071290d91dc8f612f7b008a05eaa94d45be2ef8c1d992b7ac886648a9dcf964c30e8d9a7aff90d44835beb452e0d635b9533 SHA512 8aa1cb4c3206a76d10181394a91c315967fd9d3b359194f430f075fdd5a0b4b32149eec36b85412ef7e84b55e7b01955c75486b2df82b392a5acb3df8229a88d
diff --git a/app-shells/bash/bash-5.1_p16-r12.ebuild b/app-shells/bash/bash-5.1_p16-r13.ebuild
index cc9ce6983938..38b7451addc3 100644
--- a/app-shells/bash/bash-5.1_p16-r12.ebuild
+++ b/app-shells/bash/bash-5.1_p16-r13.ebuild
@@ -328,22 +328,31 @@ pkg_postinst() {
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
 	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r6"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r13"; then
 		return
 	fi
 
-	ewarn "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
-	ewarn ""
-	ewarn "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
-	ewarn "characteristics of the operating environment, this array may contain commands"
-	ewarn "to set the window and pane title. Users that choose to customise this variable"
-	ewarn "in ~/.bashrc are advised to append their commands, using the following syntax."
-	ewarn ""
-	ewarn "PROMPT_COMMAND+=('custom command goes here')"
-	ewarn ""
-	ewarn "Alternatively, users that wish to opt out of Gentoo's window title setting"
-	ewarn "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
-	ewarn "as desired. Previously, there was no formally supported method of opting out."
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, this array may contain a command
+to set the terminal's window title. Those already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash manipulate the window title in the case
+that the terminal is controlled by sshd(8), unless screen or tmux are in use.
+Those wanting to set the title unconditionally may adjust ~/.bashrc - or create
+a custom /etc/bash/bashrc.d drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
 }
diff --git a/app-shells/bash/bash-5.2_p26-r5.ebuild b/app-shells/bash/bash-5.2_p26-r6.ebuild
index e8eaa353cf21..4350a8a719c3 100644
--- a/app-shells/bash/bash-5.2_p26-r5.ebuild
+++ b/app-shells/bash/bash-5.2_p26-r6.ebuild
@@ -372,22 +372,31 @@ pkg_postinst() {
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
 	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r6"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r13"; then
 		return
 	fi
 
-	ewarn "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
-	ewarn ""
-	ewarn "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
-	ewarn "characteristics of the operating environment, this array may contain commands"
-	ewarn "to set the window and pane title. Users that choose to customise this variable"
-	ewarn "in ~/.bashrc are advised to append their commands, using the following syntax."
-	ewarn ""
-	ewarn "PROMPT_COMMAND+=('custom command goes here')"
-	ewarn ""
-	ewarn "Alternatively, users that wish to opt out of Gentoo's window title setting"
-	ewarn "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
-	ewarn "as desired. Previously, there was no formally supported method of opting out."
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, this array may contain a command
+to set the terminal's window title. Those already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash manipulate the window title in the case
+that the terminal is controlled by sshd(8), unless screen or tmux are in use.
+Those wanting to set the title unconditionally may adjust ~/.bashrc - or create
+a custom /etc/bash/bashrc.d drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
 }
diff --git a/app-shells/bash/bash-5.3_alpha-r4.ebuild b/app-shells/bash/bash-5.3_alpha-r5.ebuild
index 9699a659026a..c0e5e68f43a5 100644
--- a/app-shells/bash/bash-5.3_alpha-r4.ebuild
+++ b/app-shells/bash/bash-5.3_alpha-r5.ebuild
@@ -371,22 +371,31 @@ pkg_postinst() {
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
 	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r6"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r13"; then
 		return
 	fi
 
-	ewarn "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
-	ewarn ""
-	ewarn "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
-	ewarn "characteristics of the operating environment, this array may contain commands"
-	ewarn "to set the window and pane title. Users that choose to customise this variable"
-	ewarn "in ~/.bashrc are advised to append their commands, using the following syntax."
-	ewarn ""
-	ewarn "PROMPT_COMMAND+=('custom command goes here')"
-	ewarn ""
-	ewarn "Alternatively, users that wish to opt out of Gentoo's window title setting"
-	ewarn "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
-	ewarn "as desired. Previously, there was no formally supported method of opting out."
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, this array may contain a command
+to set the terminal's window title. Those already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash manipulate the window title in the case
+that the terminal is controlled by sshd(8), unless screen or tmux are in use.
+Those wanting to set the title unconditionally may adjust ~/.bashrc - or create
+a custom /etc/bash/bashrc.d drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
 }
diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild
index ae661e409da8..7ef121e1c56f 100644
--- a/app-shells/bash/bash-9999.ebuild
+++ b/app-shells/bash/bash-9999.ebuild
@@ -311,6 +311,9 @@ src_install() {
 	insinto /etc/bash/bashrc.d
 	my_prefixify DIR_COLORS "${FILESDIR}"/bashrc.d/10-gentoo-color.bash | newins - 10-gentoo-color.bash
 	doins "${FILESDIR}"/bashrc.d/10-gentoo-title.bash
+	if [[ ! ${EPREFIX} ]]; then
+		doins "${FILESDIR}"/bashrc.d/15-gentoo-bashrc-check.bash
+	fi
 
 	insinto /etc/skel
 	for f in bash{_logout,_profile,rc}; do
@@ -368,22 +371,31 @@ pkg_postinst() {
 	read -r old_ver <<<"${REPLACING_VERSIONS}"
 	if [[ ! $old_ver ]]; then
 		:
-	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r1"; then
+	elif ver_test "$old_ver" -ge "5.2" && ver_test "$old_ver" -ge "5.2_p26-r6"; then
 		return
-	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r8"; then
+	elif ver_test "$old_ver" -lt "5.2" && ver_test "$old_ver" -ge "5.1_p16-r13"; then
 		return
 	fi
 
-	ewarn "Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash."
-	ewarn ""
-	ewarn "Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the"
-	ewarn "characteristics of the operating environment, this array may contain commands"
-	ewarn "to set the window and pane title. Users that choose to customise this variable"
-	ewarn "in ~/.bashrc are advised to append their commands, using the following syntax."
-	ewarn ""
-	ewarn "PROMPT_COMMAND+=('custom command goes here')"
-	ewarn ""
-	ewarn "Alternatively, users that wish to opt out of Gentoo's window title setting"
-	ewarn "behaviour may now do so by either unsetting PROMPT_COMMAND or by re-defining it"
-	ewarn "as desired. Previously, there was no formally supported method of opting out."
+	while read -r; do ewarn "${REPLY}"; done <<'EOF'
+Files situated under /etc/bash/bashrc.d must now have a suffix of .sh or .bash.
+
+Gentoo now defaults to defining PROMPT_COMMAND as an array. Depending on the
+characteristics of the operating environment, this array may contain a command
+to set the terminal's window title. Those already choosing to customise the
+PROMPT_COMMAND variable are now advised to append their commands like so:
+
+PROMPT_COMMAND+=('custom command goes here')
+
+Gentoo no longer defaults to having bash manipulate the window title in the case
+that the terminal is controlled by sshd(8), unless screen or tmux are in use.
+Those wanting to set the title unconditionally may adjust ~/.bashrc - or create
+a custom /etc/bash/bashrc.d drop-in - to set PROMPT_COMMMAND like so:
+
+PROMPT_COMMAND=(genfun_set_win_title)
+
+Those who would prefer for bash never to interfere with the window title may
+now opt out of the default title setting behaviour, either with the "unset -v
+PROMPT_COMMAND" command or by re-defining PROMPT_COMMAND as desired.
+EOF
 }
diff --git a/app-shells/bash/files/bashrc.d/10-gentoo-title.bash b/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
index 003e364ff072..2b2e23347784 100644
--- a/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
+++ b/app-shells/bash/files/bashrc.d/10-gentoo-title.bash
@@ -20,17 +20,18 @@ genfun_set_win_title() {
 	# the title bar to be affected.
 	genfun_set_win_title() {
 		genfun_sanitise_cwd
-		printf '\033]2;%s@%s - %s\007' "${USER}" "${HOSTNAME%%.*}" "${_cwd}"
+		printf '\033]0;%s@%s - %s\007' "${USER}" "${HOSTNAME%%.*}" "${_cwd}"
 	}
 
 	genfun_set_win_title
 }
 
-# If the TTY is that of sshd(8) then proceed no further. Alas, there exist many
-# operating environments in which the window title would otherwise not be
-# restored upon ssh(1) exiting. Users wishing to coerce the historical
-# behaviour have the option of setting PROMPT_COMMAND=(genfun_set_win_title).
-if [[ ${SSH_TTY} && ${SSH_TTY} == "$(tty)" ]]; then
+# Proceed no further if the TTY is that of sshd(8) and if not running a terminal
+# multiplexer. Alas, there exist many operating environments in which the window
+# title would otherwise not be restored upon ssh(1) exiting. Those who wish for
+# the title to be set unconditionally may adjust ~/.bashrc - or create a custom
+# bashrc.d drop-in - to define PROMPT_COMMAND=(genfun_set_win_title).
+if [[ ${SSH_TTY} && ${TERM} != @(screen|tmux)* && ${SSH_TTY} == "$(tty)" ]]; then
 	return
 fi