Files
Netcatty/components
陈大猫 69ccedb62d fix(terminal): prevent osc7_cwd errors after su (#2181)
* fix(terminal): prevent osc7_cwd errors after su

OSC 7 setup installed a bare osc7_cwd PROMPT_COMMAND entry. After
non-login su, that string could be inherited without the function
definition, printing "osc7_cwd: command not found".

Use a guarded prompt hook, unexport PROMPT_COMMAND, and upgrade
existing v1 rc snippets in place when setup is re-run.

* fix(terminal): safe OSC7 rc upgrade when markers are incomplete

Do not rewrite/truncate shell rc files when the Netcatty OSC 7 block is
missing an end marker or markers are unbalanced. Append a complete v2
snippet instead so setup still installs tracking without dropping user
config after an open start marker.

* fix(terminal): harden OSC7 rc upgrade safety

Address Codex review findings for OSC 7 setup upgrades:

- Never truncate incomplete/unbalanced marker regions; append v2 only
- Detect a complete v2 block for idempotent recovery
- Resolve full symlink chains; atomic same-dir replace with mode preserve
- Build stripped+v2 content in one temp write so read-only configs cannot
  lose the legacy block without receiving the replacement

* fix(terminal): replace OSC7 v1 blocks in place

Upgrade complete legacy OSC 7 blocks by substituting the marked region
at its original location instead of stripping and appending at EOF. This
keeps surrounding control flow (if/fi wrappers) valid and still writes
the full result atomically with mode preservation.

* fix(terminal): match OSC7 markers as whole lines only

Use trimmed whole-line equality for start/end markers so echo statements
that embed the marker text are not treated as block boundaries during
legacy upgrades.

* fix(terminal): preserve ownership on OSC7 rc atomic replace

When upgrading a legacy block via temp+mv, restore the original
uid:gid on the temp file before replacing so a root-run setup against
another user's HOME cannot leave a root-owned bashrc.

* fix(terminal): harden OSC7 PROMPT_COMMAND array and chown

Process every PROMPT_COMMAND array element when installing the guarded
hook so leftover osc7_cwd entries cannot duplicate OSC 7. Abort the
atomic rc replace when ownership cannot be restored, leaving the
original file untouched.

* fix(terminal): fix exported array PROMPT_COMMAND handling

Detect array PROMPT_COMMAND via the -a attribute even when combined with
-x, and stop force-unexporting PROMPT_COMMAND now that the guarded hook
is safe to inherit across su.

* test(terminal): update OSC7 assertions for export-preserving hook

* fix(terminal): fall back when OSC7 upgrade temp dir is not writable

If same-directory mktemp fails (writable file in a non-writable managed
home directory), leave the original config intact and fall back to the
append path instead of aborting setup with set -e.
2026-07-14 17:18:11 +08:00
..
2026-07-12 23:57:10 +08:00
…
2026-07-12 23:57:10 +08:00
2026-07-12 23:57:10 +08:00