mirror of
https://github.com/gunchev/home_bin.git
synced 2025-11-20 12:15:46 +00:00
Reformat, tabs to spaces.
Yeah, I thought tabs were a good idea, not any more, so…
This commit is contained in:
parent
d1d115a905
commit
674c7517dd
1 changed files with 101 additions and 97 deletions
|
|
@ -1,13 +1,14 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# DESCRIPTION
|
# DESCRIPTION
|
||||||
# An attempt to seese industrial... ops, I ment an attempt to make my
|
# An attempt to seese industrial… ops, I ment an attempt to make my
|
||||||
# bash prompt nicer and save all my bash history ordered by date with
|
# bash prompt nicer and save all my bash history ordered by date with
|
||||||
# exit codes for later review...
|
# exit codes for later review…
|
||||||
|
|
||||||
# LICENSE:
|
# LICENSE:
|
||||||
# Released under GNU Generic Public License. You should've received it with
|
# Released under GNU GPL v 2+. You should've received it with your GNU/Linux
|
||||||
# your GNU/Linux system. If not, write to the Free Software Foundation, Inc.,
|
# system. You can visit https://opensource.org/licenses/gpl-2.0.php or
|
||||||
|
# alternatively write to the Free Software Foundation, Inc.,
|
||||||
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||||
|
|
||||||
# KNOWN BUGS:
|
# KNOWN BUGS:
|
||||||
|
|
@ -15,10 +16,10 @@
|
||||||
# - logs the last command in history on control+d (EOF) or enter
|
# - 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,
|
# (could be fixed if we remember the index of the command used last time,
|
||||||
# which is currently removed by 'Cmd=${Cmd:7}')
|
# which is currently removed by 'Cmd=${Cmd:7}')
|
||||||
# - does not log history from within mc (midnight commander)
|
# - does not log history from within mc (midnight commander) this can be
|
||||||
# this can be viewed as a feature too :-) The problem is that mc
|
# viewed as a feature too :-) The problem is that mc changes
|
||||||
# changes PROMPT_COMMAND, hurting the prompt quite bad and
|
# PROMPT_COMMAND, hurting the prompt quite bad and killing the history.
|
||||||
# killing the log.
|
# Could be fixed on mc's side, no high hopes though (see RHBZ#1183192)
|
||||||
|
|
||||||
# ps-twtty-7.sh - Nice bash prompt and history archiver
|
# ps-twtty-7.sh - Nice bash prompt and history archiver
|
||||||
# by Doncho Gunchev <dgunchev@gmail.com>, 2020-10-11 14:46 EET
|
# by Doncho Gunchev <dgunchev@gmail.com>, 2020-10-11 14:46 EET
|
||||||
|
|
@ -37,105 +38,108 @@
|
||||||
# by Doncho N. Gunchev <dgunchev@gmail.com>, 2008-09-30 07:00 EEST
|
# by Doncho N. Gunchev <dgunchev@gmail.com>, 2008-09-30 07:00 EEST
|
||||||
|
|
||||||
# BASED ON
|
# BASED ON
|
||||||
# termwide prompt with tty number by Giles, 1998-11-02, https://tldp.org/HOWTO/Bash-Prompt-HOWTO/x869.html
|
# termwide prompt with tty number by Giles, 1998-11-02
|
||||||
|
# - https://tldp.org/HOWTO/Bash-Prompt-HOWTO/x869.html
|
||||||
# and
|
# and
|
||||||
# .bashrc_history.sh by Yaroslav Halchenko, 2005-03-10, http://www.onerussian.com, https://debian-administration.org/article/175/BASH_history_forever.
|
# .bashrc_history.sh by Yaroslav Halchenko, 2005-03-10
|
||||||
|
# - http://www.onerussian.com/Linux/bash_history.phtml
|
||||||
|
# - https://debian-administration.org/article/175/BASH_history_forever.
|
||||||
|
|
||||||
if [ "$PS1" ] ; then # interactive shell detection
|
if [ "$PS1" ] ; then # interactive shell detection
|
||||||
|
|
||||||
function prompt_command_exit() {
|
function prompt_command_exit() {
|
||||||
trap - EXIT
|
trap - EXIT
|
||||||
# mark the logout
|
# mark the logout
|
||||||
local HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
local HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
||||||
mkdir -p "${HistFile%/*}"
|
mkdir -p "${HistFile%/*}"
|
||||||
local Cmd="$(history 1)"
|
local Cmd="$(history 1)"
|
||||||
#Cmd=$(echo "$Cmd" | sed 's/^ *[[:digit:]][[:digit:]]* *//')
|
#Cmd=$(echo "$Cmd" | sed 's/^ *[[:digit:]][[:digit:]]* *//')
|
||||||
Cmd="${Cmd:7}"
|
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:-$(who am i | cut -d ' ' -f 1)@localhost},${my_LoginTime},$(date --rfc-3339=ns)\n$Cmd" >> "$HistFile"
|
||||||
}
|
}
|
||||||
|
|
||||||
function prompt_command() {
|
function prompt_command() {
|
||||||
# Save the error code, running any external command resets it!
|
# Save the error code, running any external command resets it!
|
||||||
local E=$?
|
local E=$?
|
||||||
|
|
||||||
# Manage the history
|
# Manage the history
|
||||||
local HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
local HistFile="$HOME/bash_history/$(date '+%Y-%m/%Y-%m-%d')"
|
||||||
mkdir -p "${HistFile%/*}"
|
mkdir -p "${HistFile%/*}"
|
||||||
|
|
||||||
if [ -z "$my_LoginTime" ]; then
|
if [ -z "$my_LoginTime" ]; then
|
||||||
my_LoginTime=$(date --rfc-3339=ns)
|
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"
|
echo -e "# Login,$USER@${HOSTNAME}:$PWD,$(tty),${SSH_CLIENT:-$(who am i | cut -d ' ' -f 1)@localhost},${my_LoginTime},${my_LoginTime}\n" >> "$HistFile"
|
||||||
else
|
else
|
||||||
local Cmd="$(history 1)"
|
local Cmd="$(history 1)"
|
||||||
#Cmd=$(echo "$Cmd" | sed 's/^ *[[:digit:]][[:digit:]]* *//')
|
#Cmd=$(echo "$Cmd" | sed 's/^ *[[:digit:]][[:digit:]]* *//')
|
||||||
Cmd="${Cmd:7}"
|
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"
|
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"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Calculate the width of the prompt:
|
# Calculate the width of the prompt:
|
||||||
my_TTY="$(tty)"
|
my_TTY="$(tty)"
|
||||||
my_TTY="${my_TTY:5}" # cut the '/dev' part -> tty/1, pts/2...
|
my_TTY="${my_TTY:5}" # cut the '/dev' part -> tty/1, pts/2...
|
||||||
my_PWD="${PWD}"
|
my_PWD="${PWD}"
|
||||||
# Add all the accessories below ...
|
# Add all the accessories below ...
|
||||||
my_D="$(date '+%Y-%m-%d %H:%M:%S')"
|
my_D="$(date '+%Y-%m-%d %H:%M:%S')"
|
||||||
local prompt="--($my_D, Err $E, $my_TTY)---($PWD)--"
|
local prompt="--($my_D, Err $E, $my_TTY)---($PWD)--"
|
||||||
local fillsize=0
|
local fillsize=0
|
||||||
[ -z "${COLUMNS}" ] && COLUMNS=$(tput cols)
|
[ -z "${COLUMNS}" ] && COLUMNS=$(tput cols)
|
||||||
let fillsize=${COLUMNS}-${#prompt}
|
let fillsize=${COLUMNS}-${#prompt}
|
||||||
my_FILL=""
|
my_FILL=""
|
||||||
if [ $fillsize -gt 0 ]; then
|
if [ $fillsize -gt 0 ]; then
|
||||||
my_FILL="────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
|
my_FILL="────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────"
|
||||||
while [ $fillsize -gt ${#my_FILL} ]; do
|
while [ $fillsize -gt ${#my_FILL} ]; do
|
||||||
my_FILL="${my_FILL}${my_FILL}${my_FILL}${my_FILL}"
|
my_FILL="${my_FILL}${my_FILL}${my_FILL}${my_FILL}"
|
||||||
done
|
done
|
||||||
my_FILL="${my_FILL::$fillsize}"
|
my_FILL="${my_FILL::$fillsize}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ $fillsize -lt 0 ]; then
|
if [ $fillsize -lt 0 ]; then
|
||||||
my_PWD="…${my_PWD:1-$fillsize}"
|
my_PWD="…${my_PWD:1-$fillsize}"
|
||||||
fi
|
fi
|
||||||
# Let other PROMPT_COMMAND scripts (if any after us) have the error code too.
|
# Let other PROMPT_COMMAND scripts (if any after us) have the error code too.
|
||||||
bash -c "exit $E"
|
bash -c "exit $E"
|
||||||
}
|
}
|
||||||
|
|
||||||
function twtty {
|
function twtty {
|
||||||
local GRAY="\[\033[1;30m\]"
|
local GRAY="\[\033[1;30m\]"
|
||||||
local LIGHT_GRAY="\[\033[0;37m\]"
|
local LIGHT_GRAY="\[\033[0;37m\]"
|
||||||
local WHITE="\[\033[1;37m\]"
|
local WHITE="\[\033[1;37m\]"
|
||||||
local NO_COLOUR="\[\033[0m\]"
|
local NO_COLOUR="\[\033[0m\]"
|
||||||
|
|
||||||
local LIGHT_BLUE="\[\033[1;34m\]"
|
local LIGHT_BLUE="\[\033[1;34m\]"
|
||||||
local YELLOW="\[\033[1;33m\]"
|
local YELLOW="\[\033[1;33m\]"
|
||||||
|
|
||||||
local RED="\[\033[0;31m\]"
|
local RED="\[\033[0;31m\]"
|
||||||
local LIGHT_RED="\[\033[1;31m\]"
|
local LIGHT_RED="\[\033[1;31m\]"
|
||||||
|
|
||||||
local GREEN="\[\033[0;32m\]"
|
local GREEN="\[\033[0;32m\]"
|
||||||
local LIGHT_GREEN="\[\033[1;32m\]"
|
local LIGHT_GREEN="\[\033[1;32m\]"
|
||||||
|
|
||||||
if [ "${UID}" -ne "0" ]; then
|
if [ "${UID}" -ne "0" ]; then
|
||||||
# Normal user colors
|
# Normal user colors
|
||||||
local C1="${GREEN}"
|
local C1="${GREEN}"
|
||||||
local C2="${LIGHT_GREEN}"
|
local C2="${LIGHT_GREEN}"
|
||||||
local C3="${WHITE}"
|
local C3="${WHITE}"
|
||||||
else
|
else
|
||||||
# root user colors
|
# root user colors
|
||||||
local C1="${LIGHT_RED}"
|
local C1="${LIGHT_RED}"
|
||||||
local C2="${YELLOW}"
|
local C2="${YELLOW}"
|
||||||
local C3="${WHITE}"
|
local C3="${WHITE}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
case "$TERM" in
|
case "$TERM" in
|
||||||
xterm*)
|
xterm*)
|
||||||
TITLEBAR='\[\033]0;\u@\h:\w\007\]'
|
TITLEBAR='\[\033]0;\u@\h:\w\007\]'
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
TITLEBAR=""
|
TITLEBAR=""
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
export PS1="$TITLEBAR\
|
export PS1="$TITLEBAR\
|
||||||
${C1}┌${C2}─(\
|
${C1}┌${C2}─(\
|
||||||
${C1}\${my_D}${C2}, ${C1}Err ${C3}\$?${C2}, ${C3}\${my_TTY}\
|
${C1}\${my_D}${C2}, ${C1}Err ${C3}\$?${C2}, ${C3}\${my_TTY}\
|
||||||
${C2})─${C1}─\${my_FILL}${C2}─(\
|
${C2})─${C1}─\${my_FILL}${C2}─(\
|
||||||
|
|
@ -146,19 +150,19 @@ ${C1}└${C2}─(\
|
||||||
${C1}\${USER}${C2}@${C1}\${HOSTNAME%%.*}\
|
${C1}\${USER}${C2}@${C1}\${HOSTNAME%%.*}\
|
||||||
${C2})${C3}\$${NO_COLOUR} "
|
${C2})${C3}\$${NO_COLOUR} "
|
||||||
|
|
||||||
export PS2="${C2}─${C1}─${C1}─${NO_COLOUR} \[\033[K\]"
|
export PS2="${C2}─${C1}─${C1}─${NO_COLOUR} \[\033[K\]"
|
||||||
if [ -z "${PROMPT_COMMAND}" ]; then
|
if [ -z "${PROMPT_COMMAND}" ]; then
|
||||||
export PROMPT_COMMAND=prompt_command
|
export PROMPT_COMMAND=prompt_command
|
||||||
else
|
else
|
||||||
if ! echo "${PROMPT_COMMAND}" | grep '\bprompt_command\b' > /dev/null 2>&1; then
|
if ! echo "${PROMPT_COMMAND}" | grep '\bprompt_command\b' > /dev/null 2>&1; then
|
||||||
export PROMPT_COMMAND="prompt_command
|
export PROMPT_COMMAND="prompt_command
|
||||||
${PROMPT_COMMAND}"
|
${PROMPT_COMMAND}"
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
trap prompt_command_exit EXIT
|
trap prompt_command_exit EXIT
|
||||||
shopt -s cmdhist histappend
|
shopt -s cmdhist histappend
|
||||||
export HISTCONTROL='ignorespace:erasedups'
|
export HISTCONTROL='ignorespace:erasedups'
|
||||||
export HISTIGNORE='history:history *'
|
export HISTIGNORE='history:history *'
|
||||||
}
|
}
|
||||||
|
|
||||||
# Secure bash history
|
# Secure bash history
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue