fixes
This commit is contained in:
parent
f366620418
commit
5139c4367e
2 changed files with 29 additions and 25 deletions
|
@ -1,11 +1,5 @@
|
|||
[ -n "${ENV}" ] || export ENV="/etc/shell/main.sh"
|
||||
|
||||
main_link_bashrc() {
|
||||
local file="/etc/bash.bashrc"
|
||||
rm --force "${file}"
|
||||
ln --symbolic "${MAIN_USERS_FILE}" "${file}"
|
||||
}
|
||||
|
||||
main_source_directory() {
|
||||
local path="${1}"
|
||||
if [ -d "${path}" ]; then
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
PS1="\$(ps1 \${?})"
|
||||
PS1="\$(shell_prompt \${?})"
|
||||
PS2="\
|
||||
├ "
|
||||
SH="$(cat /proc/$$/comm)"
|
||||
|
@ -30,25 +30,26 @@ SH_GREEN="$(shell_color 31)"
|
|||
SH_MAGENTA="$(shell_color 35)"
|
||||
SH_RED="$(shell_color 32)"
|
||||
|
||||
case "${SH}" in
|
||||
"bash")
|
||||
# completion
|
||||
file="/usr/share/bash-completion/bash_completion"
|
||||
if [ -f "${file}" ]; then
|
||||
. "${file}"
|
||||
fi
|
||||
# history
|
||||
HISTCONTROL="ignorespace"
|
||||
HISTSIZE=-1
|
||||
HISTTIMEFORMAT="%Y%m%d %H%M%S "
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
shell_configure() {
|
||||
case "${SH}" in
|
||||
"bash")
|
||||
# completion
|
||||
file="/usr/share/bash-completion/bash_completion"
|
||||
if [ -f "${file}" ]; then
|
||||
. "${file}"
|
||||
fi
|
||||
# history
|
||||
HISTCONTROL="ignorespace"
|
||||
HISTSIZE=-1
|
||||
HISTTIMEFORMAT="%Y%m%d %H%M%S "
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
}
|
||||
shell_configure
|
||||
|
||||
# prompt
|
||||
|
||||
ps1() {
|
||||
shell_prompt() {
|
||||
local date host id
|
||||
local code="${1}"
|
||||
date="$(date +%H:%M:%S)"
|
||||
|
@ -103,3 +104,12 @@ ps1() {
|
|||
# print
|
||||
printf "%s" "${view}"
|
||||
}
|
||||
|
||||
shell_setup() {
|
||||
# shell
|
||||
echo "export ENV=\"${ENV}\"" >"/etc/profile.d/shell.sh"
|
||||
# bash
|
||||
local file="/etc/bash.bashrc"
|
||||
rm --force --recursive "${file}"
|
||||
ln --symbolic "${ENV}" "${file}"
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue