mirror of
https://github.com/gunchev/home_bin.git
synced 2025-11-20 12:15:46 +00:00
Show PIPESTATUS instead of just $?.
Cleanup. Detect if BASH_COMMAND is an array (bash 5.1 NEWS) or just a string. Mark 'login' and 'logout's properly.
This commit is contained in:
parent
0749f8ff07
commit
9f28d27595
GPG key ID:
D30FD19F37E002A9
1 changed files with 71 additions and 64 deletions
|
|
@ -1,26 +1,25 @@
|
|||
#!/bin/bash
|
||||
|
||||
# DESCRIPTION
|
||||
# An attempt to seese industrial… ops, I ment an attempt to make my
|
||||
# ===========
|
||||
# An attempt to seize industrial… ops, I ment an attempt to make my
|
||||
# bash prompt nicer and save all my bash history ordered by date with
|
||||
# exit codes for later review…
|
||||
# exit codes for later review… Commands starting with space are not saved
|
||||
# because mc floods the logs otherwise.
|
||||
|
||||
# LICENSE:
|
||||
# Released under GNU GPL v 2+. You should've received it with your GNU/Linux
|
||||
# system. You can visit https://opensource.org/licenses/gpl-2.0.php or
|
||||
# system. You can visit https://opensource.org/license/gpl-2-0/ or
|
||||
# alternatively write to the Free Software Foundation, Inc.,
|
||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
|
||||
# KNOWN BUGS:
|
||||
# - logs the previous command again on control-break, control-quit
|
||||
# - logs the last command in history on control+d (EOF) or enter
|
||||
# (could be fixed if we remember the index of the command used last time,
|
||||
# which is currently removed by 'Cmd=${Cmd:7}')
|
||||
# - does not log history from within mc (midnight commander) this can be
|
||||
# viewed as a feature too :-) The problem is that mc changes
|
||||
# PROMPT_COMMAND, hurting the prompt quite bad and killing the history.
|
||||
# Could be fixed on mc's side, no high hopes though (see RHBZ#1183192)
|
||||
|
||||
# z-ps-twtty-7.sh - Nice bash prompt and history archiver
|
||||
# by Doncho Gunchev <dgunchev@gmail.com>, 2024-01-27 15:58 EET
|
||||
# Show PIPESTATUS instead of just $?. Cleanup.
|
||||
# Detect if BASH_COMMAND is an array (bash 5.1 NEWS) or just a string.
|
||||
# Mark 'login' and 'logout's properly.
|
||||
# I have 15+ years of bash history now, since 2009…
|
||||
#
|
||||
# ps-twtty-7.sh - Nice bash prompt and history archiver
|
||||
# by Doncho Gunchev <dgunchev@gmail.com>, 2020-10-11 14:46 EET
|
||||
# Integrate better with vte.sh, just name this in a way to sort after it.
|
||||
|
|
@ -47,33 +46,26 @@
|
|||
|
||||
if [ "$PS1" ] ; then # interactive shell detection
|
||||
|
||||
# Log the logout event.
|
||||
function prompt_command_exit() {
|
||||
trap - EXIT
|
||||
# mark the logout
|
||||
local HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
||||
local now=$(date --rfc-3339=ns)
|
||||
local HistFile
|
||||
HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
||||
mkdir -p "${HistFile%/*}"
|
||||
local Cmd="$(history 1)"
|
||||
#Cmd=$(echo "$Cmd" | sed 's/^ *[[:digit:]][[:digit:]]* *//')
|
||||
Cmd="${Cmd:7}"
|
||||
echo -e "# Logout,$USER@${HOSTNAME}:$PWD,$(tty),${SSH_CLIENT:-$(who am i | cut -d ' ' -f 1)@localhost},${my_LoginTime},$(date --rfc-3339=ns)\n$Cmd" >> "$HistFile"
|
||||
echo -e "# Logout,$USER@${HOSTNAME}:$PWD,$(tty),${SSH_CLIENT:-local},login=${my_LoginTime:-$now},now=$now\nlogout" >> "$HistFile"
|
||||
}
|
||||
|
||||
# Executed before each prompt. Fill the variables needed by PS1 here.
|
||||
function prompt_command() {
|
||||
# Save the error code, running any external command resets it!
|
||||
local E=$?
|
||||
local now=$(date --rfc-3339=ns)
|
||||
|
||||
# Manage the history
|
||||
local HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
||||
mkdir -p "${HistFile%/*}"
|
||||
|
||||
if [ -z "$my_LoginTime" ]; then
|
||||
my_LoginTime=$(date --rfc-3339=ns)
|
||||
echo -e "# Login,$USER@${HOSTNAME}:$PWD,$(tty),${SSH_CLIENT:-$(who am i | cut -d ' ' -f 1)@localhost},${my_LoginTime},${my_LoginTime}\n" >> "$HistFile"
|
||||
else
|
||||
local Cmd="$(history 1)"
|
||||
#Cmd=$(echo "$Cmd" | sed 's/^ *[[:digit:]][[:digit:]]* *//')
|
||||
Cmd="${Cmd:7}"
|
||||
echo -e "# CMD,\$?=$E,$USER@${HOSTNAME}:$PWD,$(tty),${SSH_CLIENT:-$(who am i | cut -d ' ' -f 1)@localhost},${my_LoginTime},$(date --rfc-3339=ns)\n$Cmd" >> "$HistFile"
|
||||
my_LoginTime="$now"
|
||||
fi
|
||||
|
||||
# Calculate the width of the prompt:
|
||||
|
|
@ -82,42 +74,54 @@ function prompt_command() {
|
|||
my_PWD="${PWD}"
|
||||
# Add all the accessories below ...
|
||||
my_D="$(date '+%Y-%m-%d %H:%M:%S')"
|
||||
local prompt="--($my_D, Err $E, $my_TTY)---($PWD)--"
|
||||
local fillsize=0
|
||||
# This is for string size calculations only.
|
||||
local prompt="--($my_D, Err ${my_P[*]}, $my_TTY)---($PWD)--"
|
||||
local fill_size=0
|
||||
[ -z "${COLUMNS}" ] && COLUMNS=$(tput cols)
|
||||
let fillsize=${COLUMNS}-${#prompt}
|
||||
((fill_size=COLUMNS-${#prompt}))
|
||||
my_FILL=""
|
||||
if [ $fillsize -gt 0 ]; then
|
||||
if [ "$fill_size" -gt 0 ]; then
|
||||
my_FILL="────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
|
||||
while [ $fillsize -gt ${#my_FILL} ]; do
|
||||
while [ "$fill_size" -gt ${#my_FILL} ]; do
|
||||
my_FILL="${my_FILL}${my_FILL}${my_FILL}${my_FILL}"
|
||||
done
|
||||
my_FILL="${my_FILL::$fillsize}"
|
||||
my_FILL="${my_FILL::$fill_size}"
|
||||
fi
|
||||
|
||||
if [ $fillsize -lt 0 ]; then
|
||||
my_PWD="…${my_PWD:1-$fillsize}"
|
||||
if [ "$fill_size" -lt 0 ]; then
|
||||
my_PWD="…${my_PWD:1-$fill_size}"
|
||||
fi
|
||||
|
||||
local OldCmdNo="$CmdNo" # See if we got new command later.
|
||||
local Cmd="$(history 1)"
|
||||
CmdNo="${Cmd:0:7}"
|
||||
if [[ -z "$OldCmdNo" ]]; then
|
||||
Cmd="login"
|
||||
else
|
||||
Cmd="${Cmd:7}"
|
||||
fi
|
||||
if [ "$OldCmdNo" != "$CmdNo" ]; then # Only save new commands, not empty lines or Ctrl+C.
|
||||
echo -e "# PIPESTATUS=${my_P[*]},$USER@${HOSTNAME}:$PWD,$(tty),${SSH_CLIENT:-local},login=$my_LoginTime,now=$now\n$Cmd" >> "$HistFile"
|
||||
fi
|
||||
# Let other PROMPT_COMMAND scripts (if any after us) have the error code too.
|
||||
bash -c "exit $E"
|
||||
}
|
||||
|
||||
function twtty {
|
||||
local GRAY="\[\033[1;30m\]"
|
||||
local LIGHT_GRAY="\[\033[0;37m\]"
|
||||
local WHITE="\[\033[1;37m\]"
|
||||
local NO_COLOUR="\[\033[0m\]"
|
||||
# The special "\[" and "\]" are telling bash that the text enclosed will not move the caret.
|
||||
local GRAY='\[\033[1;30m\]'
|
||||
local LIGHT_GRAY='\[\033[0;37m\]'
|
||||
local WHITE='\[\033[1;37m\]'
|
||||
local NO_COLOUR='\[\033[0m\]'
|
||||
|
||||
local LIGHT_BLUE="\[\033[1;34m\]"
|
||||
local YELLOW="\[\033[1;33m\]"
|
||||
local LIGHT_BLUE='\[\033[1;34m\]'
|
||||
local YELLOW='\[\033[1;33m\]'
|
||||
|
||||
local RED="\[\033[0;31m\]"
|
||||
local LIGHT_RED="\[\033[1;31m\]"
|
||||
local RED='\[\033[0;31m\]'
|
||||
local LIGHT_RED='\[\033[1;31m\]'
|
||||
|
||||
local GREEN="\[\033[0;32m\]"
|
||||
local LIGHT_GREEN="\[\033[1;32m\]"
|
||||
local GREEN='\[\033[0;32m\]'
|
||||
local LIGHT_GREEN='\[\033[1;32m\]'
|
||||
|
||||
if [ "${UID}" -ne "0" ]; then
|
||||
if [ "${UID}" -ne '0' ]; then
|
||||
# Normal user colors
|
||||
local C1="${GREEN}"
|
||||
local C2="${LIGHT_GREEN}"
|
||||
|
|
@ -129,19 +133,18 @@ function twtty {
|
|||
local C3="${WHITE}"
|
||||
fi
|
||||
|
||||
|
||||
case "$TERM" in
|
||||
xterm*)
|
||||
TITLEBAR='\[\033]0;\u@\h:\w\007\]'
|
||||
;;
|
||||
*)
|
||||
TITLEBAR=""
|
||||
TITLEBAR=''
|
||||
;;
|
||||
esac
|
||||
|
||||
export PS1="$TITLEBAR\
|
||||
${C1}┌${C2}─(\
|
||||
${C1}\${my_D}${C2}, ${C1}Err ${C3}\$?${C2}, ${C3}\${my_TTY}\
|
||||
${C1}\${my_D}${C2}, ${C1}Err ${C3}\${my_P[*]}${C2}, ${C3}\${my_TTY}\
|
||||
${C2})─${C1}─\${my_FILL}${C2}─(\
|
||||
${C1}\${my_PWD}\
|
||||
${C2})─${C1}─\
|
||||
|
|
@ -151,28 +154,32 @@ ${C1}\${USER}${C2}@${C1}\${HOSTNAME%%.*}\
|
|||
${C2})${C3}\$${NO_COLOUR} "
|
||||
|
||||
export PS2="${C2}─${C1}─${C1}─${NO_COLOUR} \[\033[K\]"
|
||||
if [ -z "${PROMPT_COMMAND}" ]; then
|
||||
PROMPT_COMMAND=prompt_command
|
||||
|
||||
local P='my_P=("${PIPESTATUS[@]}");prompt_command'
|
||||
if declare -p PROMPT_COMMAND &>/dev/null; then
|
||||
local re='^declare -a '
|
||||
if [[ "$(declare -p PROMPT_COMMAND)" =~ $re ]]; then # Array, supported since bash 5.1
|
||||
PROMPT_COMMAND=("$P" "${PROMPT_COMMAND[@]}")
|
||||
else # String
|
||||
PROMPT_COMMAND="$P;${PROMPT_COMMAND}"
|
||||
fi
|
||||
else
|
||||
if ! echo "${PROMPT_COMMAND}" | grep '\bprompt_command\b' > /dev/null 2>&1; then
|
||||
PROMPT_COMMAND="prompt_command
|
||||
${PROMPT_COMMAND}"
|
||||
fi
|
||||
PROMPT_COMMAND="$P"
|
||||
fi
|
||||
unset P
|
||||
|
||||
trap prompt_command_exit EXIT
|
||||
shopt -s cmdhist histappend
|
||||
export HISTCONTROL='ignorespace:erasedups'
|
||||
export HISTCONTROL='ignorespace' # ':erasedups' would prevent logging duplicate commands.
|
||||
export HISTIGNORE='history:history *'
|
||||
}
|
||||
|
||||
# Secure bash history
|
||||
if [ ! -d "$HOME/bash_history" ]; then
|
||||
mkdir "$HOME/bash_history"
|
||||
chmod 0700 "$HOME/bash_history"
|
||||
mkdir -m 0700 "$HOME/bash_history"
|
||||
fi
|
||||
|
||||
twtty
|
||||
|
||||
unset twtty
|
||||
# call and unset
|
||||
twtty; unset twtty
|
||||
|
||||
fi
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue