jakob/myshellconfig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

export logfunctions

Browse source
This commit is contained in:
Jakobus Schürz 2020-09-21 21:24:34 +02:00
parent b694334bd9
commit c91d9e4400
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
myshell_load_defaults
View file

@ -11,10 +11,10 @@ case $(tty) in
TMOUT=${MYSHELLCONFIG_USER_TMOUT:-1000} TMOUT=${MYSHELLCONFIG_USER_TMOUT:-1000}
;; ;;
esac esac
echo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2 loginfo "Run in TTY -> set autologout \$TMOUT=$TMOUT" >&2
;; ;;
*) *)
echo "Run in graphical terminal - set no autologout" >&2 loginfo "Run in graphical terminal - set no autologout" >&2
unset TMOUT unset TMOUT
;; ;;
esac esac
@ -100,7 +100,7 @@ else
case $TERM in case $TERM in
*screen*) *screen*)
echo BASHRC: $BASHRC -> source it loginfo BASHRC: $BASHRC -> source it
#[ -e $BASHRC ] && . "$BASHRC" #[ -e $BASHRC ] && . "$BASHRC"
if [ ! -z ${BASHRC+x} ]; then if [ ! -z ${BASHRC+x} ]; then
if [ -e $BASHRC ] ; then if [ -e $BASHRC ] ; then
@ -125,7 +125,7 @@ export HISTIGNORE="ls:l:cd:exit:pwd:date:mencfs:"
export HISTTIMEFORMAT='%F %T ' export HISTTIMEFORMAT='%F %T '
export HISTSIZE=999999 export HISTSIZE=999999
echo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2 loginfo "bashrc_add sourced" 2>&1 |tee -a ${MYSHELLCONFIG_LOGFILE} >&2
#echo "bashrc_add sourced" >&2 #echo "bashrc_add sourced" >&2
# Export several functions for being usable in subshells # Export several functions for being usable in subshells
@ -133,12 +133,17 @@ export -f token
export -f sudo export -f sudo
export -f reachable export -f reachable
export -f reachable-default export -f reachable-default
export -f logerror
export -f logwarn
export -f loginfo
export -f logdebug
export -f logtrace
cat << EOF > ~/.ssh/agents/agent-default-$(hostname) cat << EOF > ~/.ssh/agents/agent-default-$(hostname)
SSH_AUTH_SOCK=${SSH_AUTH_SOCK}; export SSH_AUTH_SOCK; SSH_AUTH_SOCK=${SSH_AUTH_SOCK}; export SSH_AUTH_SOCK;
SSH_AGENT_PID=${SSH_AGENT_PID}; export SSH_AGENT_PID; SSH_AGENT_PID=${SSH_AGENT_PID}; export SSH_AGENT_PID;
echo Agent pid ${SSH_AGENT_PID}; loginfo Agent pid ${SSH_AGENT_PID};
EOF EOF
[ -z "${SSH_ADD_DEFAULT_OPTIONS+x}" ] && { SSH_ADD_DEFAULT_OPTIONS="-t 7200"; export SSH_ADD_DEFAULT_OPTIONS; } [ -z "${SSH_ADD_DEFAULT_OPTIONS+x}" ] && { SSH_ADD_DEFAULT_OPTIONS="-t 7200"; export SSH_ADD_DEFAULT_OPTIONS; }