Merge pull request #433 from Googulator/better-early-bash-prompt
Improve pseudo-interactive prompts using the early bash
This commit is contained in:
commit
f237d67b47
|
@ -451,8 +451,9 @@ FILE *start_script(int id, int bash_build) {
|
||||||
if (bash_build != 1) {
|
if (bash_build != 1) {
|
||||||
fputs("set -E\ntrap 'env PS1=\"[TRAP] \\w # \" bash -i' ERR\n", out);
|
fputs("set -E\ntrap 'env PS1=\"[TRAP] \\w # \" bash -i' ERR\n", out);
|
||||||
} else {
|
} else {
|
||||||
fputs("set -E\ntrap 'bash -c '\"'\"'while true; do printf \""
|
/* FIXME early bash has buggy ERR trap handling */
|
||||||
"[TRAP - use Ctrl+D] $(pwd) # \"; $(cat); done'\"'\"'' ERR\n",
|
fputs("set -e\ntrap 'bash -c '\"'\"'while true; do printf \""
|
||||||
|
"[TRAP - use Ctrl+D] $(pwd) # \"; eval \"$(cat)\"; done'\"'\"'' EXIT\n",
|
||||||
out);
|
out);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -7,5 +7,5 @@
|
||||||
if bash --version | grep -q 'GPLv3'; then
|
if bash --version | grep -q 'GPLv3'; then
|
||||||
env - PATH=${PREFIX}/bin PS1="\w # " openvt -- bash -i
|
env - PATH=${PREFIX}/bin PS1="\w # " openvt -- bash -i
|
||||||
else
|
else
|
||||||
bash -c 'while true; do printf "[early Bash - use Ctrl+D] $(pwd) # "; $(cat /dev/tty2); done' &> /dev/tty2 &
|
bash -c 'while true; do printf "[early Bash - use Ctrl+D] $(pwd) # "; eval "$(cat /dev/tty2)"; done' &> /dev/tty2 &
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue