sergiotarxz/termux-packages
sergiotarxz/termux-packages
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make PS1 dynamic and shell-specific

Browse Source 
PS1 is not supposed to be an environment variable (i.e. will not
be listed in `printenv` but only in `set`). Its value should also
be shell-specific.

With this commit we can stop exporting a static PS1 as env var on
the java side.

The prompt would now indicate whether the current user is root.
This commit is contained in:
Tom Yan 2018-06-20 02:08:15 +08:00 committed by Fredrik Fornwall
parent 586f8b84c0
commit 5d3ef9ba0c
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/bash/etc-bash.bashrc
View File

@ -1,3 +1,5 @@
command_not_found_handle() { command_not_found_handle() {
@TERMUX_PREFIX@/libexec/termux/command-not-found "$1" @TERMUX_PREFIX@/libexec/termux/command-not-found "$1"
} }
PS1='\$ '

4
packages/openssh/session.c.patch
View File

@ -1,5 +1,5 @@
diff --git a/session.c.orig b/session.c diff --git a/session.c.orig b/session.c
index 58826db..c251ee9 100644 index 58826db..890e452 100644
--- a/session.c.orig --- a/session.c.orig
+++ b/session.c +++ b/session.c
@@ -199,7 +199,7 @@ auth_input_request_forwarding(struct ssh *ssh, struct passwd * pw) @@ -199,7 +199,7 @@ auth_input_request_forwarding(struct ssh *ssh, struct passwd * pw)
@ -36,7 +36,7 @@ index 58826db..c251ee9 100644
child_set_env(&env, &envsize, "TZ", getenv("TZ")); child_set_env(&env, &envsize, "TZ", getenv("TZ"));
+#ifdef __ANDROID__ +#ifdef __ANDROID__
+ char const* envs_to_keep[] = {"LD_LIBRARY_PATH", "PATH", "ANDROID_ROOT", "ANDROID_DATA", "EXTERNAL_STORAGE", "LANG", "PREFIX", "TMPDIR", "PS1"}; + char const* envs_to_keep[] = {"LD_LIBRARY_PATH", "PATH", "ANDROID_ROOT", "ANDROID_DATA", "EXTERNAL_STORAGE", "LANG", "PREFIX", "TMPDIR"};
+ for (i = 0; i < (sizeof(envs_to_keep) / sizeof(envs_to_keep[0])); i++) { + for (i = 0; i < (sizeof(envs_to_keep) / sizeof(envs_to_keep[0])); i++) {
+ char const* env_to_keep_name = envs_to_keep[i]; + char const* env_to_keep_name = envs_to_keep[i];
+ char const* env_to_keep_value = getenv(env_to_keep_name); + char const* env_to_keep_value = getenv(env_to_keep_name);

2
packages/zsh/etc-zshrc
View File

@ -2,3 +2,5 @@ command_not_found_handler() {
@TERMUX_PREFIX@/libexec/termux/command-not-found $1 @TERMUX_PREFIX@/libexec/termux/command-not-found $1
return 0 return 0
} }
PS1='%# '